Changeset 91079 in webkit

Timestamp:

Jul 15, 2011 11:25:32 AM (13 years ago)

Author:

kenneth@webkit.org

Message:

REGRESSION(91064): Upstream QtWebKit/N9 changes related tovisibleContentRect

Reviewed by Antonio Gomes.

Only set setFixedVisibleContentRect when in resizesToContents mode.

• WebCoreSupport/FrameLoaderClientQt.cpp:

(WebCore::FrameLoaderClientQt::transitionToCommittedForNewPage):

Location:

trunk/Source/WebKit/qt

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/FrameLoaderClientQt.cpp (modified) (1 diff)

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2011-07-15  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+
+        REGRESSION(91064): Upstream QtWebKit/N9 changes related tovisibleContentRect
+
+        Reviewed by Antonio Gomes.
+
+        Only set setFixedVisibleContentRect when in resizesToContents mode.
+
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::transitionToCommittedForNewPage):
+
 2011-07-15  Kenneth Rohde Christiansen  <kenneth@webkit.org>
 

trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp

@@ -297 +297 @@
     bool isMainFrame = m_frame == m_frame->page()->mainFrame();
     if (isMainFrame && page->d->client) {
-        m_frame->view()->setPaintsEntireContents(page->d->client->viewResizesToContentsEnabled());
-        m_frame->view()->setDelegatesScrolling(page->d->client->viewResizesToContentsEnabled());
+        bool resizesToContents = page->d->client->viewResizesToContentsEnabled();
+
+        m_frame->view()->setPaintsEntireContents(resizesToContents);
+        m_frame->view()->setDelegatesScrolling(resizesToContents);
 
         // The HistoryController will update the scroll position later if needed.
-        m_frame->view()->setFixedVisibleContentRect(IntRect(IntPoint::zero(), currentVisibleContentSize));
+        IntRect rect = resizesToContents ? IntRect(IntPoint::zero(), currentVisibleContentSize) : IntRect();
+        m_frame->view()->setFixedVisibleContentRect(rect);
     }
 }