Changeset 71803 in webkit

Timestamp:

Nov 11, 2010 4:32:29 AM (13 years ago)

Author:

andreas.kling@nokia.com

Message:

2010-11-11 Andreas Kling <​kling@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@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):

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/FrameView.cpp (modified) (1 diff)
• WebKit/qt/Api/qgraphicswebview.cpp (modified) (1 diff)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-11-11  Andreas Kling  <kling@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@rim.com>
 

trunk/WebCore/page/FrameView.cpp

@@ -1843 +1843 @@
     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));

trunk/WebKit/qt/Api/qgraphicswebview.cpp

@@ -142 +142 @@
     }
     page->d->page->settings()->setShouldDelegateScrolling(resizesToContents);
+    page->d->page->mainFrame()->view()->setPaintsEntireContents(resizesToContents);
 }
 

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-11-11  Andreas Kling  <kling@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@gmail.com>
 

trunk/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp

@@ -281 +281 @@
                         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());
 }