Title: [126277] trunk/Source/WebKit2
- Revision
- 126277
- Author
- [email protected]
- Date
- 2012-08-22 01:44:21 -0700 (Wed, 22 Aug 2012)
Log Message
[Qt] Avoid using WebKit macros in qrawwebview_p.h
https://bugs.webkit.org/show_bug.cgi?id=94648
Patch by Luiz Agostini <[email protected]> on 2012-08-22
Reviewed by Noam Rosenthal.
ENABLE(FEATURE) should not be used in qrawwebview_p.h because it is an API header file.
* UIProcess/API/qt/raw/qrawwebview.cpp:
(QRawWebView::sendTouchEvent):
* UIProcess/API/qt/raw/qrawwebview_p.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (126276 => 126277)
--- trunk/Source/WebKit2/ChangeLog 2012-08-22 08:42:57 UTC (rev 126276)
+++ trunk/Source/WebKit2/ChangeLog 2012-08-22 08:44:21 UTC (rev 126277)
@@ -1,3 +1,16 @@
+2012-08-22 Luiz Agostini <[email protected]>
+
+ [Qt] Avoid using WebKit macros in qrawwebview_p.h
+ https://bugs.webkit.org/show_bug.cgi?id=94648
+
+ Reviewed by Noam Rosenthal.
+
+ ENABLE(FEATURE) should not be used in qrawwebview_p.h because it is an API header file.
+
+ * UIProcess/API/qt/raw/qrawwebview.cpp:
+ (QRawWebView::sendTouchEvent):
+ * UIProcess/API/qt/raw/qrawwebview_p.h:
+
2012-08-21 Sheriff Bot <[email protected]>
Unreviewed, rolling out r126216.
Modified: trunk/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview.cpp (126276 => 126277)
--- trunk/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview.cpp 2012-08-22 08:42:57 UTC (rev 126276)
+++ trunk/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview.cpp 2012-08-22 08:44:21 UTC (rev 126277)
@@ -380,9 +380,9 @@
d->m_webPageProxy->handleWheelEvent(WebKit::NativeWebWheelEvent(event, QTransform()));
}
-#if ENABLE(TOUCH_EVENTS)
void QRawWebView::sendTouchEvent(QTouchEvent* event)
{
+#if ENABLE(TOUCH_EVENTS)
d->m_webPageProxy->handleTouchEvent(WebKit::NativeWebTouchEvent(event, QTransform()));
+#endif
}
-#endif
Modified: trunk/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p.h (126276 => 126277)
--- trunk/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p.h 2012-08-22 08:42:57 UTC (rev 126276)
+++ trunk/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p.h 2012-08-22 08:44:21 UTC (rev 126277)
@@ -30,7 +30,6 @@
#include <WebKit2/WKContext.h>
#include <WebKit2/WKPage.h>
#include <WebKit2/WKPageGroup.h>
-#include <wtf/Platform.h>
QT_BEGIN_NAMESPACE
class QRect;
@@ -95,9 +94,7 @@
void sendKeyEvent(QKeyEvent*);
void sendMouseEvent(QMouseEvent*, int clickCount = 0);
void sendWheelEvent(QWheelEvent*);
-#if ENABLE(TOUCH_EVENTS)
void sendTouchEvent(QTouchEvent*);
-#endif
private:
QRawWebViewPrivate* d;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
