[Qt][WK2] Build failure when using --no-touch-events
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 16 Mar 2012 15:51:07 +0000 (15:51 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 16 Mar 2012 15:51:07 +0000 (15:51 +0000)
https://bugs.webkit.org/show_bug.cgi?id=81241

Patch by Dinu Jacob <dinu.jacob@nokia.com> on 2012-03-16
Reviewed by Simon Hausmann.

Fixed inconsistency in the use of ENABLE_TOUCH_EVENTS flag that caused build
failure when using --no-touch-events option

* UIProcess/qt/QtPageClient.h:
(QtPageClient):
* UIProcess/qt/QtWebPageEventHandler.cpp:
(QtWebPageEventHandler::handlePotentialSingleTapEvent):
* UIProcess/qt/QtWebPageEventHandler.h:
(QtWebPageEventHandler):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::WebPage):
* WebProcess/WebPage/WebPage.h:
(WebPage):
* WebProcess/WebPage/WebPage.messages.in:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@111010 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/qt/QtPageClient.h
Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp
Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.h
Source/WebKit2/WebProcess/WebPage/WebPage.cpp
Source/WebKit2/WebProcess/WebPage/WebPage.h
Source/WebKit2/WebProcess/WebPage/WebPage.messages.in

index de3e4c9fdb6ef310f98858ee0e45c97b6724cbf5..8d609ce9deb333328115e29c5be1b26cfbb98a7a 100644 (file)
@@ -1,3 +1,25 @@
+2012-03-16  Dinu Jacob  <dinu.jacob@nokia.com>
+
+        [Qt][WK2] Build failure when using --no-touch-events
+        https://bugs.webkit.org/show_bug.cgi?id=81241
+
+        Reviewed by Simon Hausmann.
+
+        Fixed inconsistency in the use of ENABLE_TOUCH_EVENTS flag that caused build
+        failure when using --no-touch-events option
+
+        * UIProcess/qt/QtPageClient.h:
+        (QtPageClient):
+        * UIProcess/qt/QtWebPageEventHandler.cpp:
+        (QtWebPageEventHandler::handlePotentialSingleTapEvent):
+        * UIProcess/qt/QtWebPageEventHandler.h:
+        (QtWebPageEventHandler):
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::WebPage):
+        * WebProcess/WebPage/WebPage.h:
+        (WebPage):
+        * WebProcess/WebPage/WebPage.messages.in:
+
 2012-03-16  Kenneth Rohde Christiansen  <kenneth@webkit.org>
 
         Merge setVisibleContentsForScaling with setVisibleContentsRectForPanning
index f09db824385ab3ea76e7a2795edb1a1332741551..00caf9c7752fc69e9f2a59aa2e5180f86947129a 100644 (file)
@@ -98,7 +98,9 @@ public:
     virtual void didFindZoomableArea(const WebCore::IntPoint&, const WebCore::IntRect&);
     virtual void updateTextInputState();
     virtual void doneWithGestureEvent(const WebGestureEvent&, bool wasEventHandled);
+#if ENABLE(TOUCH_EVENTS)
     virtual void doneWithTouchEvent(const NativeWebTouchEvent&, bool wasEventHandled);
+#endif
 
 private:
     QQuickWebView* m_webView;
index 95ed431916d40fd7581d7e37116c1e846aae553b..51cd3270735aea9f4ce7181ebdf1c3905e38027e 100644 (file)
@@ -230,8 +230,12 @@ void QtWebPageEventHandler::handleDropEvent(QDropEvent* ev)
 
 void QtWebPageEventHandler::handlePotentialSingleTapEvent(const QTouchEvent::TouchPoint& point)
 {
+#if ENABLE(TOUCH_EVENTS)
     QTransform fromItemTransform = m_webPage->transformFromItem();
     m_webPageProxy->handlePotentialActivation(fromItemTransform.map(point.pos()).toPoint());
+#else
+    Q_UNUSED(point);
+#endif
 }
 
 void QtWebPageEventHandler::handleSingleTapEvent(const QTouchEvent::TouchPoint& point)
@@ -422,6 +426,7 @@ void QtWebPageEventHandler::doneWithGestureEvent(const WebGestureEvent& event, b
     setInputPanelVisible(newVisible);
 }
 
+#if ENABLE(TOUCH_EVENTS)
 void QtWebPageEventHandler::doneWithTouchEvent(const NativeWebTouchEvent& event, bool wasEventHandled)
 {
     if (!m_interactionEngine)
@@ -469,6 +474,7 @@ void QtWebPageEventHandler::doneWithTouchEvent(const NativeWebTouchEvent& event,
         m_tapGestureRecognizer.recognize(ev, eventTimestampMillis);
     }
 }
+#endif
 
 void QtWebPageEventHandler::didFindZoomableArea(const IntPoint& target, const IntRect& area)
 {
index 519ec5471c4f56467f5e8d0e8f4a461aa80e6122..2040d28bd67aec21bb11906cb24be3d2523cf0ae 100644 (file)
@@ -69,7 +69,9 @@ public:
     void didFindZoomableArea(const WebCore::IntPoint& target, const WebCore::IntRect& area);
     void updateTextInputState();
     void doneWithGestureEvent(const WebGestureEvent& event, bool wasEventHandled);
+#if ENABLE(TOUCH_EVENTS)
     void doneWithTouchEvent(const NativeWebTouchEvent&, bool wasEventHandled);
+#endif
     void resetGestureRecognizers();
 
     QtViewportInteractionEngine* interactionEngine() { return m_interactionEngine; }
index ebc8fd6ca7fe6458fa9651eebbde89dd9f53ebd7..647f2fcbd86d9e77fba09efbd2d205737e99b186 100644 (file)
@@ -196,9 +196,11 @@ WebPage::WebPage(uint64_t pageID, const WebPageCreationParameters& parameters)
 #endif
     , m_setCanStartMediaTimer(WebProcess::shared().runLoop(), this, &WebPage::setCanStartMediaTimerFired)
     , m_findController(this)
+#if ENABLE(TOUCH_EVENTS)
 #if PLATFORM(QT)
     , m_tapHighlightController(this)
 #endif
+#endif
 #if ENABLE(GEOLOCATION)
     , m_geolocationPermissionRequestManager(this)
 #endif
index 1981e143d758a6e4f411d06ffe0b1c11e45fe438..1a3d771cdb6278940d425065b3f3002cdf514d2a 100644 (file)
@@ -320,7 +320,7 @@ public:
     static const WebEvent* currentEvent();
 
     FindController& findController() { return m_findController; }
-#if PLATFORM(QT)
+#if ENABLE(TOUCH_EVENTS) && PLATFORM(QT)
     TapHighlightController& tapHighlightController() { return m_tapHighlightController; }
 #endif
 
@@ -734,7 +734,7 @@ private:
 #endif
 
     FindController m_findController;
-#if PLATFORM(QT)
+#if ENABLE(TOUCH_EVENTS) && PLATFORM(QT)
     TapHighlightController m_tapHighlightController;
 #endif
     RefPtr<PageOverlay> m_pageOverlay;
index c20b0d9bb55f1cf73a5c663ec1f6b830083171a5..ff4be82dc20e48b8a4c5a2bd9f624b8eaadaff3f 100644 (file)
@@ -40,9 +40,9 @@ messages -> WebPage {
 #if ENABLE(TOUCH_EVENTS)
     TouchEvent(WebKit::WebTouchEvent event)
     TouchEventSyncForTesting(WebKit::WebTouchEvent event) -> (bool handled)
-#if PLATFORM(QT)
-    HighlightPotentialActivation(WebCore::IntPoint point)
 #endif
+#if ENABLE(TOUCH_EVENTS) && PLATFORM(QT)
+    HighlightPotentialActivation(WebCore::IntPoint point)
 #endif
 
     ContextMenuHidden()