Diff
Modified: trunk/Source/WebKit2/ChangeLog (111009 => 111010)
--- trunk/Source/WebKit2/ChangeLog 2012-03-16 15:01:16 UTC (rev 111009)
+++ trunk/Source/WebKit2/ChangeLog 2012-03-16 15:51:07 UTC (rev 111010)
@@ -1,3 +1,25 @@
+2012-03-16 Dinu Jacob <[email protected]>
+
+ [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 <[email protected]>
Merge setVisibleContentsForScaling with setVisibleContentsRectForPanning
Modified: trunk/Source/WebKit2/UIProcess/qt/QtPageClient.h (111009 => 111010)
--- trunk/Source/WebKit2/UIProcess/qt/QtPageClient.h 2012-03-16 15:01:16 UTC (rev 111009)
+++ trunk/Source/WebKit2/UIProcess/qt/QtPageClient.h 2012-03-16 15:51:07 UTC (rev 111010)
@@ -98,7 +98,9 @@
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;
Modified: trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp (111009 => 111010)
--- trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp 2012-03-16 15:01:16 UTC (rev 111009)
+++ trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp 2012-03-16 15:51:07 UTC (rev 111010)
@@ -230,8 +230,12 @@
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 @@
setInputPanelVisible(newVisible);
}
+#if ENABLE(TOUCH_EVENTS)
void QtWebPageEventHandler::doneWithTouchEvent(const NativeWebTouchEvent& event, bool wasEventHandled)
{
if (!m_interactionEngine)
@@ -469,6 +474,7 @@
m_tapGestureRecognizer.recognize(ev, eventTimestampMillis);
}
}
+#endif
void QtWebPageEventHandler::didFindZoomableArea(const IntPoint& target, const IntRect& area)
{
Modified: trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.h (111009 => 111010)
--- trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.h 2012-03-16 15:01:16 UTC (rev 111009)
+++ trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.h 2012-03-16 15:51:07 UTC (rev 111010)
@@ -69,7 +69,9 @@
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; }
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (111009 => 111010)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-03-16 15:01:16 UTC (rev 111009)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-03-16 15:51:07 UTC (rev 111010)
@@ -196,9 +196,11 @@
#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
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (111009 => 111010)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2012-03-16 15:01:16 UTC (rev 111009)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2012-03-16 15:51:07 UTC (rev 111010)
@@ -320,7 +320,7 @@
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 @@
#endif
FindController m_findController;
-#if PLATFORM(QT)
+#if ENABLE(TOUCH_EVENTS) && PLATFORM(QT)
TapHighlightController m_tapHighlightController;
#endif
RefPtr<PageOverlay> m_pageOverlay;
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (111009 => 111010)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2012-03-16 15:01:16 UTC (rev 111009)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2012-03-16 15:51:07 UTC (rev 111010)
@@ -40,10 +40,10 @@
#if ENABLE(TOUCH_EVENTS)
TouchEvent(WebKit::WebTouchEvent event)
TouchEventSyncForTesting(WebKit::WebTouchEvent event) -> (bool handled)
-#if PLATFORM(QT)
+#endif
+#if ENABLE(TOUCH_EVENTS) && PLATFORM(QT)
HighlightPotentialActivation(WebCore::IntPoint point)
#endif
-#endif
ContextMenuHidden()
