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

[noam.rosenthal at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit a7b915c70ee872d514b12af7c3f9ec6d801851d2
Author: noam.rosenthal at nokia.com <noam.rosenthal at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 18 16:48:07 2010 +0000

    2010-10-18  No'am Rosenthal  <noam.rosenthal at nokia.com>
    
            Reviewed by Andreas Kling.
    
            [Qt] AC rendering bugs
    
            This fixes a regression that was introduced by making scrolling in accelerated compositing automatic,
            which made our explicit function to scroll the compositing layers superfluous, making the scrolling behavior
            when graphics layers are present incorrect. The fix simply removes those redundant functions.
    
            https://bugs.webkit.org/show_bug.cgi?id=47571
    
            * WebCoreSupport/PageClientQt.cpp:
            (WebCore::PageClientQGraphicsWidget::scroll):
            (WebCore::PageClientQGraphicsWidget::update):
            (WebCore::PageClientQGraphicsWidget::setRootGraphicsLayer):
            * WebCoreSupport/PageClientQt.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69966 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 464095c..83f543b 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,21 @@
+2010-10-18  No'am Rosenthal  <noam.rosenthal at nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] AC rendering bugs
+
+        This fixes a regression that was introduced by making scrolling in accelerated compositing automatic,
+        which made our explicit function to scroll the compositing layers superfluous, making the scrolling behavior
+        when graphics layers are present incorrect. The fix simply removes those redundant functions.
+
+        https://bugs.webkit.org/show_bug.cgi?id=47571
+
+        * WebCoreSupport/PageClientQt.cpp:
+        (WebCore::PageClientQGraphicsWidget::scroll):
+        (WebCore::PageClientQGraphicsWidget::update):
+        (WebCore::PageClientQGraphicsWidget::setRootGraphicsLayer):
+        * WebCoreSupport/PageClientQt.h:
+
 2010-10-18  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
 
         Reviewed by nobody, build fix.
diff --git a/WebKit/qt/WebCoreSupport/PageClientQt.cpp b/WebKit/qt/WebCoreSupport/PageClientQt.cpp
index 9f11496..9aa01a2 100644
--- a/WebKit/qt/WebCoreSupport/PageClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/PageClientQt.cpp
@@ -118,10 +118,6 @@ PageClientQGraphicsWidget::~PageClientQGraphicsWidget()
 void PageClientQGraphicsWidget::scroll(int dx, int dy, const QRect& rectToScroll)
 {
     view->scroll(qreal(dx), qreal(dy), rectToScroll);
-
-#if USE(ACCELERATED_COMPOSITING)
-    updateCompositingScrollPosition();
-#endif
 }
 
 void PageClientQGraphicsWidget::update(const QRect& dirtyRect)
@@ -133,8 +129,6 @@ void PageClientQGraphicsWidget::update(const QRect& dirtyRect)
         overlay->update(QRectF(dirtyRect));
 #if USE(ACCELERATED_COMPOSITING)
     syncLayers();
-    // This might be a slow-scroll. We ensure that the compositing layers are in the right position.
-    updateCompositingScrollPosition();
 #endif
 }
 
@@ -185,7 +179,6 @@ void PageClientQGraphicsWidget::setRootGraphicsLayer(QGraphicsItem* layer)
         layer->setFlag(QGraphicsItem::ItemClipsChildrenToShape, true);
         layer->setParentItem(view);
         layer->setZValue(RootGraphicsLayerZValue);
-        updateCompositingScrollPosition();
     }
     createOrDeleteOverlay();
 }
@@ -197,13 +190,6 @@ void PageClientQGraphicsWidget::markForSync(bool scheduleSync)
         syncMetaMethod.invoke(view, Qt::QueuedConnection);
 }
 
-void PageClientQGraphicsWidget::updateCompositingScrollPosition()
-{
-    if (rootGraphicsLayer && page && page->mainFrame()) {
-        const QPoint scrollPosition = page->mainFrame()->scrollPosition();
-        rootGraphicsLayer.data()->setPos(-scrollPosition);
-    }
-}
 #endif
 
 #if ENABLE(TILED_BACKING_STORE)
diff --git a/WebKit/qt/WebCoreSupport/PageClientQt.h b/WebKit/qt/WebCoreSupport/PageClientQt.h
index 3c32ec1..7014fd2 100644
--- a/WebKit/qt/WebCoreSupport/PageClientQt.h
+++ b/WebKit/qt/WebCoreSupport/PageClientQt.h
@@ -170,7 +170,6 @@ public:
 #if USE(ACCELERATED_COMPOSITING)
     virtual void setRootGraphicsLayer(QGraphicsItem* layer);
     virtual void markForSync(bool scheduleSync);
-    void updateCompositingScrollPosition();
     void syncLayers();
 
     // QGraphicsWebView can render composited layers

-- 
WebKit Debian packaging