Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
- index bb8d995..124f6f5 100644
- --- a/WebCore/ChangeLog
- +++ b/WebCore/ChangeLog
- @@ -1,3 +1,15 @@
- +2010-11-10 Andreas Kling <kling@webkit.org>
- +
- + Reviewed by Kenneth Rohde Christiansen.
- +
- + 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-11 Dan Bernstein <mitz@apple.com>
- Reverted r71975:71976. That change was wrong, and the tests caught it.
- 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..83c1fab 100644
- --- a/WebKit/qt/ChangeLog
- +++ b/WebKit/qt/ChangeLog
- @@ -1,3 +1,16 @@
- +2010-11-10 Andreas Kling <kling@webkit.org>
- +
- + Reviewed by Kenneth Rohde Christiansen.
- +
- + 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>
- Unreviewed, rolling out r71733.
- diff --git a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
- index 1b57138..1ffcfb7 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() && 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)
Add Comment
Please, Sign In to add comment
