[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 163965869a3014db1c027d74481795fd0cd33a6b
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 17 18:43:01 2010 +0000

    2010-11-17  Kenneth Rohde Christiansen  <kenneth at webkit.org>
    
            Reviewed by Andreas Kling.
    
            [WK2] Set paintsEntireContents for "resizes to contents" mode
    
            Only relevant for the tiled backing store.
    
            * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
            (WebKit::WebFrameLoaderClient::transitionToCommittedForNewPage):
            * WebProcess/WebPage/WebPage.cpp:
            (WebKit::WebPage::setResizesToContentsUsingLayoutSize):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72221 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 3de0545..5868d8a 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-17  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [WK2] Set paintsEntireContents for "resizes to contents" mode
+
+        Only relevant for the tiled backing store.
+
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::transitionToCommittedForNewPage):
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::setResizesToContentsUsingLayoutSize):
+
 2010-11-17  Andras Becsi  <abecsi at webkit.org>
 
         Reviewed by Andreas Kling.
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp b/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
index 7414f1f..9e3efaa 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
+++ b/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
@@ -955,6 +955,9 @@ void WebFrameLoaderClient::transitionToCommittedForNewPage()
     bool isMainFrame = webPage->mainFrame() == m_frame;
 
     m_frame->coreFrame()->createView(m_frame->page()->size(), Color::white, false, webPage->resizesToContentsLayoutSize(), isMainFrame && webPage->resizesToContentsEnabled());
+
+    if (isMainFrame && webPage->resizesToContentsEnabled())
+        m_frame->coreFrame()->view()->setPaintsEntireContents(true);
 #else
     m_frame->coreFrame()->createView(m_frame->page()->size(), Color::white, false, IntSize(), false);
 #endif
diff --git a/WebKit2/WebProcess/WebPage/WebPage.cpp b/WebKit2/WebProcess/WebPage/WebPage.cpp
index 170cce3..7fac5bc 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -428,10 +428,12 @@ void WebPage::setResizesToContentsUsingLayoutSize(const IntSize& targetLayoutSiz
     if (m_resizesToContentsLayoutSize.isEmpty()) {
         m_page->settings()->setShouldDelegateScrolling(false);
         frame->view()->setUseFixedLayout(false);
+        frame->view()->setPaintsEntireContents(false);
     } else {
         m_page->settings()->setShouldDelegateScrolling(true);
         frame->view()->setUseFixedLayout(true);
         frame->view()->setFixedLayoutSize(m_resizesToContentsLayoutSize);
+        frame->view()->setPaintsEntireContents(true);
     }
     frame->view()->forceLayout();
 }

-- 
WebKit Debian packaging