[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 6d5b8be93f9aa29763fd099ec7732715e2d1989e
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 11 12:32:29 2010 +0000

    2010-11-11  Andreas Kling  <kling at webkit.org>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            FrameView: Don't clip to visibleContentRect in paintEntireContents mode
            https://bugs.webkit.org/show_bug.cgi?id=49375
    
            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-11  Andreas Kling  <kling at webkit.org>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            FrameView: Don't clip to visibleContentRect in paintEntireContents mode
            https://bugs.webkit.org/show_bug.cgi?id=49375
    
            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@71803 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a31b01f..5ba2c9b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-11-11  Andreas Kling  <kling at webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        FrameView: Don't clip to visibleContentRect in paintEntireContents mode
+        https://bugs.webkit.org/show_bug.cgi?id=49375
+
+        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  Nikolas Zimmermann  <nzimmermann at rim.com>
 
         Reviewed by Dirk Schulze.
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 cf6a32f..4dffc19 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,19 @@
+2010-11-11  Andreas Kling  <kling at webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        FrameView: Don't clip to visibleContentRect in paintEntireContents mode
+        https://bugs.webkit.org/show_bug.cgi?id=49375
+
+        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  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r71733.
diff --git a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
index 1b57138..c24a87f 100644
--- a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
@@ -280,6 +280,10 @@ void FrameLoaderClientQt::transitionToCommittedForNewPage()
                         preferredLayoutSize.isValid(),
                         hScrollbar, hLock,
                         vScrollbar, vLock);
+
+    bool isMainFrame = m_frame == m_frame->page()->mainFrame();
+    if (isMainFrame && page->d->client)
+        m_frame->view()->setPaintsEntireContents(page->d->client->viewResizesToContentsEnabled());
 }
 
 void FrameLoaderClientQt::dispatchDidBecomeFrameset(bool)

-- 
WebKit Debian packaging