Title: [91079] trunk/Source/WebKit/qt
- Revision
- 91079
- Author
- [email protected]
- Date
- 2011-07-15 11:25:32 -0700 (Fri, 15 Jul 2011)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/qt/ChangeLog (91078 => 91079)
--- trunk/Source/WebKit/qt/ChangeLog 2011-07-15 18:11:24 UTC (rev 91078)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-07-15 18:25:32 UTC (rev 91079)
@@ -1,5 +1,16 @@
2011-07-15 Kenneth Rohde Christiansen <[email protected]>
+ 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 <[email protected]>
+
Upstream QtWebKit/N9 changes related to visibleContentRect
https://bugs.webkit.org/show_bug.cgi?id=64589
Modified: trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp (91078 => 91079)
--- trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp 2011-07-15 18:11:24 UTC (rev 91078)
+++ trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp 2011-07-15 18:25:32 UTC (rev 91079)
@@ -296,11 +296,14 @@
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);
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
