[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 9fcd3230e5cfb2159938ff5a627dc79495a4acc0
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 10 13:48:39 2010 +0000

    2010-11-10  Kenneth Rohde Christiansen  <kenneth at webkit.org>
    
            Reviewed by Andreas Kling.
    
            Use paintEntireContents in combination with tiling, allowing to
            actually set visibleContentRect to something different from
            the actual contents size.
    
            * Api/qgraphicswebview.cpp:
            (QGraphicsWebViewPrivate::updateResizesToContentsForPage):
            * WebCoreSupport/FrameLoaderClientQt.cpp:
            (WebCore::FrameLoaderClientQt::transitionToCommittedForNewPage):
    2010-11-10  Kenneth Rohde Christiansen  <kenneth at webkit.org>
    
            Reviewed by Andreas Kling.
    
            In paintEntireContents mode (used in combination with tiling) we
            cannot clip to the actual visibleContentRect as the clipped regions
            will not be updated again on scroll. If paintsEntireContents is
            enabled, return the actual content rect.
    
            * page/FrameView.cpp:
            (WebCore::FrameView::windowClipRect):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71733 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index cf27a9c..d073be6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-10  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        In paintEntireContents mode (used in combination with tiling) we
+        cannot clip to the actual visibleContentRect as the clipped regions
+        will not be updated again on scroll. If paintsEntireContents is
+        enabled, return the actual content rect.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::windowClipRect):
+
 2010-11-10  Shinichiro Hamaji  <hamaji at chromium.org>
 
         Adding a manual test which I forgot to add in r71618.
diff --git a/WebCore/page/FrameView.cpp b/WebCore/page/FrameView.cpp
index f4b9b9f..fe0be6a 100644
--- a/WebCore/page/FrameView.cpp
+++ b/WebCore/page/FrameView.cpp
@@ -1842,6 +1842,9 @@ IntRect FrameView::windowClipRect(bool clipToContents) const
 {
     ASSERT(m_frame->view() == this);
 
+    if (paintsEntireContents())
+        return IntRect(IntPoint(0, 0), contentsSize());
+
     // Set our clip rect to be our contents.
     IntRect clipRect = contentsToWindow(visibleContentRect(!clipToContents));
     if (!m_frame || !m_frame->document() || !m_frame->document()->ownerElement())
diff --git a/WebKit/qt/Api/qgraphicswebview.cpp b/WebKit/qt/Api/qgraphicswebview.cpp
index f026827..6cc2aa0 100644
--- a/WebKit/qt/Api/qgraphicswebview.cpp
+++ b/WebKit/qt/Api/qgraphicswebview.cpp
@@ -141,6 +141,7 @@ void QGraphicsWebViewPrivate::updateResizesToContentsForPage()
                          q, SLOT(_q_contentsSizeChanged(const QSize&)));
     }
     page->d->page->settings()->setShouldDelegateScrolling(resizesToContents);
+    page->d->page->mainFrame()->view()->setPaintsEntireContents(resizesToContents);
 }
 
 void QGraphicsWebViewPrivate::_q_contentsSizeChanged(const QSize& size)
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 0abcb9e..55cca93 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-10  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        Use paintEntireContents in combination with tiling, allowing to
+        actually set visibleContentRect to something different from
+        the actual contents size.
+
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebViewPrivate::updateResizesToContentsForPage):
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::transitionToCommittedForNewPage):
+
 2010-11-08  Benjamin Poulain  <benjamin.poulain at nokia.com>
 
         Reviewed by Andreas Kling.
diff --git a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
index 1b57138..76fda94 100644
--- a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
@@ -274,12 +274,18 @@ void FrameLoaderClientQt::transitionToCommittedForNewPage()
     bool hLock = hScrollbar != ScrollbarAuto;
     bool vLock = vScrollbar != ScrollbarAuto;
 
+    bool paintsEntireContents = m_frame->view()->paintsEntireContents();
+
     m_frame->createView(m_webFrame->page()->viewportSize(),
                         backgroundColor, !backgroundColor.alpha(),
                         preferredLayoutSize.isValid() ? IntSize(preferredLayoutSize) : IntSize(),
                         preferredLayoutSize.isValid(),
                         hScrollbar, hLock,
                         vScrollbar, vLock);
+
+    bool isMainFrame = m_frame == m_frame->page()->mainFrame();
+    if (isMainFrame)
+        m_frame->view()->setPaintsEntireContents(paintsEntireContents);
 }
 
 void FrameLoaderClientQt::dispatchDidBecomeFrameset(bool)

-- 
WebKit Debian packaging