[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[kbalazs at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 179b1df59cfab504a36f42673a4cbd09ea376ec0
Author: kbalazs at webkit.org <kbalazs at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jan 8 19:11:20 2011 +0000

    [Qt][WK2] QWKView does not propagate show and hide events to the drawing area
    https://bugs.webkit.org/show_bug.cgi?id=52108
    
    Reviewed by Kenneth Rohde Christiansen.
    
    * UIProcess/API/qt/qgraphicswkview.cpp:
    (QGraphicsWKView::event): Call setPageIsVisible on the drawing area
    if the event is Show or Hide.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75323 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index ef42c9a..8b35bd2 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-08  Balazs Kelemen  <kbalazs at webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt][WK2] QWKView does not propagate show and hide events to the drawing area
+        https://bugs.webkit.org/show_bug.cgi?id=52108
+
+        * UIProcess/API/qt/qgraphicswkview.cpp:
+        (QGraphicsWKView::event): Call setPageIsVisible on the drawing area
+        if the event is Show or Hide.
+
 2011-01-08  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp b/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp
index 7876614..9f15717 100644
--- a/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp
+++ b/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp
@@ -222,9 +222,21 @@ QVariant QGraphicsWKView::itemChange(GraphicsItemChange change, const QVariant&
 */
 bool QGraphicsWKView::event(QEvent* event)
 {
-    if (event->type() == QEvent::TouchBegin || event->type() == QEvent::TouchEnd || event->type() == QEvent::TouchUpdate) {
+    QEvent::Type eventType = event->type();
+    switch (eventType) {
+    case QEvent::TouchBegin:
+    case QEvent::TouchEnd:
+    case QEvent::TouchUpdate:
         touchEvent(static_cast<QTouchEvent*>(event));
         return true;
+    case QEvent::Show:
+        page()->d->page->drawingArea()->setPageIsVisible(true);
+        break;
+    case QEvent::Hide:
+        page()->d->page->drawingArea()->setPageIsVisible(false);
+        break;
+    default:
+        break;
     }
 
     // Here so that it can be reimplemented without breaking ABI.

-- 
WebKit Debian packaging