Changeset 126277 in webkit

Timestamp:

Aug 22, 2012 1:44:21 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[Qt] Avoid using WebKit macros in qrawwebview_p.h
​https://bugs.webkit.org/show_bug.cgi?id=94648

Patch by Luiz Agostini <​luiz.agostini@nokia.com> 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:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/qt/raw/qrawwebview.cpp (modified) (1 diff)
• UIProcess/API/qt/raw/qrawwebview_p.h (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-08-22  Luiz Agostini  <luiz.agostini@nokia.com>
+
+        [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  <webkit.review.bot@gmail.com>
 

trunk/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview.cpp

@@ -381 +381 @@
 }
 
+void QRawWebView::sendTouchEvent(QTouchEvent* event)
+{
 #if ENABLE(TOUCH_EVENTS)
-void QRawWebView::sendTouchEvent(QTouchEvent* event)
-{
     d->m_webPageProxy->handleTouchEvent(WebKit::NativeWebTouchEvent(event, QTransform()));
-}
-#endif
+#endif
+}

trunk/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p.h

@@ -31 +31 @@
 #include <WebKit2/WKPage.h>
 #include <WebKit2/WKPageGroup.h>
-#include <wtf/Platform.h>
 
 QT_BEGIN_NAMESPACE
@@ -96 +95 @@
     void sendMouseEvent(QMouseEvent*, int clickCount = 0);
     void sendWheelEvent(QWheelEvent*);
-#if ENABLE(TOUCH_EVENTS)
     void sendTouchEvent(QTouchEvent*);
-#endif
 
 private: