Title: [111530] trunk/Source/WebKit2
- Revision
- 111530
- Author
- [email protected]
- Date
- 2012-03-21 06:23:16 -0700 (Wed, 21 Mar 2012)
Log Message
The activation highlight does not always hide
https://bugs.webkit.org/show_bug.cgi?id=81767
Reviewed by Simon Hausmann.
The zero point used for hiding potential activations should
not be transformed.
* UIProcess/qt/QtWebPageEventHandler.cpp:
(QtWebPageEventHandler::handlePotentialSingleTapEvent):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (111529 => 111530)
--- trunk/Source/WebKit2/ChangeLog 2012-03-21 13:22:08 UTC (rev 111529)
+++ trunk/Source/WebKit2/ChangeLog 2012-03-21 13:23:16 UTC (rev 111530)
@@ -1,3 +1,16 @@
+2012-03-21 Kenneth Rohde Christiansen <[email protected]>
+
+ The activation highlight does not always hide
+ https://bugs.webkit.org/show_bug.cgi?id=81767
+
+ Reviewed by Simon Hausmann.
+
+ The zero point used for hiding potential activations should
+ not be transformed.
+
+ * UIProcess/qt/QtWebPageEventHandler.cpp:
+ (QtWebPageEventHandler::handlePotentialSingleTapEvent):
+
2012-03-21 Dinu Jacob <[email protected]>
[Qt][WK2] Item cannot be selected from select list in touch webview
Modified: trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp (111529 => 111530)
--- trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp 2012-03-21 13:22:08 UTC (rev 111529)
+++ trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp 2012-03-21 13:23:16 UTC (rev 111530)
@@ -232,8 +232,13 @@
void QtWebPageEventHandler::handlePotentialSingleTapEvent(const QTouchEvent::TouchPoint& point)
{
#if ENABLE(TOUCH_EVENTS)
- QTransform fromItemTransform = m_webPage->transformFromItem();
- m_webPageProxy->handlePotentialActivation(fromItemTransform.map(point.pos()).toPoint(), IntSize(point.rect().size().toSize()));
+ if (point.pos() == QPointF()) {
+ // An empty point deactivates the highlighting.
+ m_webPageProxy->handlePotentialActivation(IntPoint(), IntSize());
+ } else {
+ QTransform fromItemTransform = m_webPage->transformFromItem();
+ m_webPageProxy->handlePotentialActivation(IntPoint(fromItemTransform.map(point.pos()).toPoint()), IntSize(point.rect().size().toSize()));
+ }
#else
Q_UNUSED(point);
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
