[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[benjamin.poulain at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit ab40b8226e51801d7b7de91f8f58d4c1f327567b
Author: benjamin.poulain at nokia.com <benjamin.poulain at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 18 18:09:02 2010 +0000

    2010-11-18  Benjamin Poulain  <benjamin.poulain at nokia.com>
    
            Reviewed by Laszlo Gombos.
    
            [Qt] [WK2] WebKit 2 would not compile for Qt without ENABLE_TOUCH_EVENT
            https://bugs.webkit.org/show_bug.cgi?id=49664
    
            Move the ENABLE(TOUCH_EVENTS) to the code where internal WebKit touch
            types are used.
    
            * UIProcess/API/qt/qgraphicswkview.cpp:
            (QGraphicsWKView::touchEvent):
            * UIProcess/API/qt/qwkpage.cpp:
            (QWKPagePrivate::touchEvent):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72305 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 794d9c6..5b75597 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,18 @@
+2010-11-18  Benjamin Poulain  <benjamin.poulain at nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt] [WK2] WebKit 2 would not compile for Qt without ENABLE_TOUCH_EVENT
+        https://bugs.webkit.org/show_bug.cgi?id=49664
+
+        Move the ENABLE(TOUCH_EVENTS) to the code where internal WebKit touch
+        types are used.
+
+        * UIProcess/API/qt/qgraphicswkview.cpp:
+        (QGraphicsWKView::touchEvent):
+        * UIProcess/API/qt/qwkpage.cpp:
+        (QWKPagePrivate::touchEvent):
+
 2010-11-17  Andreas Kling  <kling at webkit.org>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp b/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp
index 08bdbbb..aacade9 100644
--- a/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp
+++ b/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp
@@ -305,12 +305,10 @@ void QGraphicsWKView::wheelEvent(QGraphicsSceneWheelEvent* ev)
         QGraphicsItem::wheelEvent(ev);
 }
 
-#if ENABLE(TOUCH_EVENTS)
 void QGraphicsWKView::touchEvent(QTouchEvent* ev)
 {
     page()->d->touchEvent(ev);
 }
-#endif
 
 void QGraphicsWKView::focusInEvent(QFocusEvent*)
 {
diff --git a/WebKit2/UIProcess/API/qt/qwkpage.cpp b/WebKit2/UIProcess/API/qt/qwkpage.cpp
index 4a1f2ce..18ecea2 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage.cpp
+++ b/WebKit2/UIProcess/API/qt/qwkpage.cpp
@@ -295,8 +295,12 @@ void QWKPagePrivate::_q_webActionTriggered(bool checked)
 
 void QWKPagePrivate::touchEvent(QTouchEvent* event)
 {
+#if ENABLE(TOUCH_EVENTS)
     WebTouchEvent touchEvent = WebEventFactory::createWebTouchEvent(event);
     page->handleTouchEvent(touchEvent);
+#else
+    event->ignore();
+#endif
 }
 
 QWKPage::QWKPage(WKPageNamespaceRef namespaceRef)

-- 
WebKit Debian packaging