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

[andreas.kling at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 2aa1d16f30ffc26b38d3f282154a52abac129ff7
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 3 15:46:13 2010 +0000

    2010-11-03  Andreas Kling  <kling at webkit.org>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] QGWV: Keep the scrolling delegation intact when switching pages
    
            * Api/qgraphicswebview.cpp:
            (QGraphicsWebViewPrivate::updateResizesToContentsForPage): Turn on/off
            scrolling delegation depending on the resizeToContents mode.
            (QGraphicsWebViewPrivate::detachCurrentPage): Turn off scrolling delegation.
            (QGraphicsWebView::setResizesToContents):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71241 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qgraphicswebview.cpp b/WebKit/qt/Api/qgraphicswebview.cpp
index 1ae52de..f026827 100644
--- a/WebKit/qt/Api/qgraphicswebview.cpp
+++ b/WebKit/qt/Api/qgraphicswebview.cpp
@@ -140,6 +140,7 @@ void QGraphicsWebViewPrivate::updateResizesToContentsForPage()
         QObject::disconnect(page->mainFrame(), SIGNAL(contentsSizeChanged(QSize)),
                          q, SLOT(_q_contentsSizeChanged(const QSize&)));
     }
+    page->d->page->settings()->setShouldDelegateScrolling(resizesToContents);
 }
 
 void QGraphicsWebViewPrivate::_q_contentsSizeChanged(const QSize& size)
@@ -411,6 +412,8 @@ void QGraphicsWebViewPrivate::detachCurrentPage()
     if (!page)
         return;
 
+    page->d->page->settings()->setShouldDelegateScrolling(false);
+
     page->d->view.clear();
 
     // The client has always to be deleted.
@@ -821,7 +824,6 @@ void QGraphicsWebView::setResizesToContents(bool enabled)
     if (d->resizesToContents == enabled)
         return;
     d->resizesToContents = enabled;
-    d->page->d->page->settings()->setShouldDelegateScrolling(enabled);
     if (d->page)
         d->updateResizesToContentsForPage();
 }
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index f0a2e15..6ba203c 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-03  Andreas Kling  <kling at webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] QGWV: Keep the scrolling delegation intact when switching pages
+
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebViewPrivate::updateResizesToContentsForPage): Turn on/off
+        scrolling delegation depending on the resizeToContents mode.
+        (QGraphicsWebViewPrivate::detachCurrentPage): Turn off scrolling delegation.
+        (QGraphicsWebView::setResizesToContents):
+
 2010-11-03  Kenneth Rohde Christiansen  <kenneth at webkit.org>
 
         Reviewed by Andreas Kling.

-- 
WebKit Debian packaging