Title: [122986] trunk/Source/WebKit2
- Revision
- 122986
- Author
- [email protected]
- Date
- 2012-07-18 10:37:29 -0700 (Wed, 18 Jul 2012)
Log Message
[Qt] Build fix for ENABLE_TOUCH_EVENTS=0
Rubber-stamped by No'am Rosenthal.
Add the appropriate ENABLE(TOUCH_EVENTS) where they're needed.
* UIProcess/API/qt/raw/qrawwebview.cpp:
* UIProcess/API/qt/raw/qrawwebview_p.h: include Platform.h so we can use the ENABLE macro.
* UIProcess/InspectorServer/qt/WebInspectorServerQt.cpp: Also add the missing QFile include.
* UIProcess/qt/QtWebPageEventHandler.cpp:
(WebKit::QtWebPageEventHandler::deactivateTapHighlight):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (122985 => 122986)
--- trunk/Source/WebKit2/ChangeLog 2012-07-18 17:22:40 UTC (rev 122985)
+++ trunk/Source/WebKit2/ChangeLog 2012-07-18 17:37:29 UTC (rev 122986)
@@ -1,3 +1,17 @@
+2012-07-18 Pierre Rossi <[email protected]>
+
+ [Qt] Build fix for ENABLE_TOUCH_EVENTS=0
+
+ Rubber-stamped by No'am Rosenthal.
+
+ Add the appropriate ENABLE(TOUCH_EVENTS) where they're needed.
+
+ * UIProcess/API/qt/raw/qrawwebview.cpp:
+ * UIProcess/API/qt/raw/qrawwebview_p.h: include Platform.h so we can use the ENABLE macro.
+ * UIProcess/InspectorServer/qt/WebInspectorServerQt.cpp: Also add the missing QFile include.
+ * UIProcess/qt/QtWebPageEventHandler.cpp:
+ (WebKit::QtWebPageEventHandler::deactivateTapHighlight):
+
2012-07-18 Christophe Dumez <[email protected]>
[EFL][WK2] Add Ewk class for cookie manager
Modified: trunk/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview.cpp (122985 => 122986)
--- trunk/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview.cpp 2012-07-18 17:22:40 UTC (rev 122985)
+++ trunk/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview.cpp 2012-07-18 17:37:29 UTC (rev 122986)
@@ -25,7 +25,9 @@
#include "LayerTreeCoordinatorProxy.h"
#include "NativeWebKeyboardEvent.h"
#include "NativeWebMouseEvent.h"
+#if ENABLE(TOUCH_EVENTS)
#include "NativeWebTouchEvent.h"
+#endif
#include "NativeWebWheelEvent.h"
#include "NotImplemented.h"
#include "WebContext.h"
@@ -378,7 +380,9 @@
d->m_webPageProxy->handleWheelEvent(WebKit::NativeWebWheelEvent(event, QTransform()));
}
+#if ENABLE(TOUCH_EVENTS)
void QRawWebView::sendTouchEvent(QTouchEvent* event)
{
d->m_webPageProxy->handleTouchEvent(WebKit::NativeWebTouchEvent(event, QTransform()));
}
+#endif
Modified: trunk/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p.h (122985 => 122986)
--- trunk/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p.h 2012-07-18 17:22:40 UTC (rev 122985)
+++ trunk/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p.h 2012-07-18 17:37:29 UTC (rev 122986)
@@ -30,6 +30,7 @@
#include <WebKit2/WKContext.h>
#include <WebKit2/WKPage.h>
#include <WebKit2/WKPageGroup.h>
+#include <wtf/Platform.h>
class QRect;
class QRectF;
@@ -92,7 +93,9 @@
void sendKeyEvent(QKeyEvent*);
void sendMouseEvent(QMouseEvent*, int clickCount = 0);
void sendWheelEvent(QWheelEvent*);
+#if ENABLE(TOUCH_EVENTS)
void sendTouchEvent(QTouchEvent*);
+#endif
private:
QRawWebViewPrivate* d;
Modified: trunk/Source/WebKit2/UIProcess/InspectorServer/qt/WebInspectorServerQt.cpp (122985 => 122986)
--- trunk/Source/WebKit2/UIProcess/InspectorServer/qt/WebInspectorServerQt.cpp 2012-07-18 17:22:40 UTC (rev 122985)
+++ trunk/Source/WebKit2/UIProcess/InspectorServer/qt/WebInspectorServerQt.cpp 2012-07-18 17:37:29 UTC (rev 122986)
@@ -25,6 +25,7 @@
#include "WebInspectorProxy.h"
#include "WebPageProxy.h"
+#include <QFile>
#include <WebCore/MIMETypeRegistry.h>
#include <wtf/text/CString.h>
#include <wtf/text/StringBuilder.h>
Modified: trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp (122985 => 122986)
--- trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp 2012-07-18 17:22:40 UTC (rev 122985)
+++ trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp 2012-07-18 17:37:29 UTC (rev 122986)
@@ -246,12 +246,14 @@
void QtWebPageEventHandler::deactivateTapHighlight()
{
+#if ENABLE(TOUCH_EVENTS)
if (!m_isTapHighlightActive)
return;
// An empty point deactivates the highlighting.
m_webPageProxy->handlePotentialActivation(IntPoint(), IntSize());
m_isTapHighlightActive = false;
+#endif
}
void QtWebPageEventHandler::handleSingleTapEvent(const QTouchEvent::TouchPoint& point)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
