Title: [100760] trunk/Source/WebKit2
- Revision
- 100760
- Author
- zeno.albis...@nokia.com
- Date
- 2011-11-18 05:48:58 -0800 (Fri, 18 Nov 2011)
Log Message
[Qt][WK2] setViewportInteractionEngine must also set the InteractionEngine for the tap recognizer.
https://bugs.webkit.org/show_bug.cgi?id=72717
Reviewed by Kenneth Rohde Christiansen.
* UIProcess/qt/QtTapGestureRecognizer.cpp:
(WebKit::QtTapGestureRecognizer::setViewportInteractionEngine):
* UIProcess/qt/QtTapGestureRecognizer.h:
* UIProcess/qt/QtWebPageProxy.cpp:
(QtWebPageProxy::setViewportInteractionEngine):
* UIProcess/qt/QtWebPageProxy.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (100759 => 100760)
--- trunk/Source/WebKit2/ChangeLog 2011-11-18 13:45:42 UTC (rev 100759)
+++ trunk/Source/WebKit2/ChangeLog 2011-11-18 13:48:58 UTC (rev 100760)
@@ -1,3 +1,17 @@
+2011-11-18 Zeno Albisser <z...@webkit.org>
+
+ [Qt][WK2] setViewportInteractionEngine must also set the InteractionEngine for the tap recognizer.
+ https://bugs.webkit.org/show_bug.cgi?id=72717
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ * UIProcess/qt/QtTapGestureRecognizer.cpp:
+ (WebKit::QtTapGestureRecognizer::setViewportInteractionEngine):
+ * UIProcess/qt/QtTapGestureRecognizer.h:
+ * UIProcess/qt/QtWebPageProxy.cpp:
+ (QtWebPageProxy::setViewportInteractionEngine):
+ * UIProcess/qt/QtWebPageProxy.h:
+
2011-11-18 Simon Hausmann <simon.hausm...@nokia.com>
[Qt][WK2] Fix popups for select elements.
Modified: trunk/Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.cpp (100759 => 100760)
--- trunk/Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.cpp 2011-11-18 13:45:42 UTC (rev 100759)
+++ trunk/Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.cpp 2011-11-18 13:48:58 UTC (rev 100760)
@@ -40,6 +40,12 @@
reset();
}
+void QtTapGestureRecognizer::setViewportInteractionEngine(QtViewportInteractionEngine* engine)
+{
+ QtGestureRecognizer::setViewportInteractionEngine(engine);
+ reset();
+}
+
bool QtTapGestureRecognizer::recognize(const QTouchEvent* event, qint64 eventTimestampMillis)
{
if (event->touchPoints().size() != 1) {
Modified: trunk/Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.h (100759 => 100760)
--- trunk/Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.h 2011-11-18 13:45:42 UTC (rev 100759)
+++ trunk/Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.h 2011-11-18 13:48:58 UTC (rev 100760)
@@ -50,6 +50,7 @@
class QtTapGestureRecognizer : public QObject, private QtGestureRecognizer {
public:
QtTapGestureRecognizer(QtViewportInteractionEngine*, QtWebPageProxy*);
+ void setViewportInteractionEngine(QtViewportInteractionEngine*);
bool recognize(const QTouchEvent*, qint64 eventTimestampMillis);
void reset();
Modified: trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp (100759 => 100760)
--- trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp 2011-11-18 13:45:42 UTC (rev 100759)
+++ trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp 2011-11-18 13:48:58 UTC (rev 100760)
@@ -779,6 +779,14 @@
m_context->postMessageToInjectedBundle(messageName, body.get());
}
+void QtWebPageProxy::setViewportInteractionEngine(QtViewportInteractionEngine* engine)
+{
+ m_interactionEngine = engine;
+ m_panGestureRecognizer.setViewportInteractionEngine(engine);
+ m_pinchGestureRecognizer.setViewportInteractionEngine(engine);
+ m_tapGestureRecognizer.setViewportInteractionEngine(engine);
+}
+
void QtWebPageProxy::postMessageToNavigatorQtObject(const QString& message)
{
static String messageName("MessageToNavigatorQtObject");
Modified: trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.h (100759 => 100760)
--- trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.h 2011-11-18 13:45:42 UTC (rev 100759)
+++ trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.h 2011-11-18 13:48:58 UTC (rev 100760)
@@ -181,7 +181,7 @@
void setNavigatorQtObjectEnabled(bool);
bool navigatorQtObjectEnabled() const { return m_navigatorQtObjectEnabled; }
- void setViewportInteractionEngine(QtViewportInteractionEngine* engine) { m_interactionEngine = engine; m_panGestureRecognizer.setViewportInteractionEngine(engine); m_pinchGestureRecognizer.setViewportInteractionEngine(engine);}
+ void setViewportInteractionEngine(QtViewportInteractionEngine*);
void postMessageToNavigatorQtObject(const QString&);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
