Diff
Modified: trunk/Source/WebCore/ChangeLog (141014 => 141015)
--- trunk/Source/WebCore/ChangeLog 2013-01-28 23:05:09 UTC (rev 141014)
+++ trunk/Source/WebCore/ChangeLog 2013-01-28 23:07:00 UTC (rev 141015)
@@ -1,5 +1,20 @@
2013-01-28 Sheriff Bot <[email protected]>
+ Unreviewed, rolling out r140869.
+ http://trac.webkit.org/changeset/140869
+ https://bugs.webkit.org/show_bug.cgi?id=108120
+
+ "Crashes on http://en.wikipedia.org/wiki/Wikipedia" (Requested
+ by tonyg-cr on #webkit).
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::visibleContentsResized):
+ * platform/ScrollView.cpp:
+ (WebCore::ScrollView::setFixedLayoutSize):
+ (WebCore::ScrollView::setUseFixedLayout):
+
+2013-01-28 Sheriff Bot <[email protected]>
+
Unreviewed, rolling out r140934, r140935, and r140937.
http://trac.webkit.org/changeset/140934
http://trac.webkit.org/changeset/140935
Modified: trunk/Source/WebCore/page/FrameView.cpp (141014 => 141015)
--- trunk/Source/WebCore/page/FrameView.cpp 2013-01-28 23:05:09 UTC (rev 141014)
+++ trunk/Source/WebCore/page/FrameView.cpp 2013-01-28 23:07:00 UTC (rev 141015)
@@ -2022,7 +2022,7 @@
if (!frame()->view())
return;
- if (!useFixedLayout() && needsLayout())
+ if (needsLayout())
layout();
#if USE(ACCELERATED_COMPOSITING)
Modified: trunk/Source/WebCore/platform/ScrollView.cpp (141014 => 141015)
--- trunk/Source/WebCore/platform/ScrollView.cpp 2013-01-28 23:05:09 UTC (rev 141014)
+++ trunk/Source/WebCore/platform/ScrollView.cpp 2013-01-28 23:07:00 UTC (rev 141015)
@@ -277,8 +277,6 @@
return;
m_fixedLayoutSize = newSize;
updateScrollbars(scrollOffset());
- if (m_useFixedLayout)
- contentsResized();
}
bool ScrollView::useFixedLayout() const
@@ -292,7 +290,6 @@
return;
m_useFixedLayout = enable;
updateScrollbars(scrollOffset());
- contentsResized();
}
IntSize ScrollView::contentsSize() const
Modified: trunk/Source/WebKit/chromium/ChangeLog (141014 => 141015)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-01-28 23:05:09 UTC (rev 141014)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-01-28 23:07:00 UTC (rev 141015)
@@ -1,5 +1,19 @@
2013-01-28 Sheriff Bot <[email protected]>
+ Unreviewed, rolling out r140869.
+ http://trac.webkit.org/changeset/140869
+ https://bugs.webkit.org/show_bug.cgi?id=108120
+
+ "Crashes on http://en.wikipedia.org/wiki/Wikipedia" (Requested
+ by tonyg-cr on #webkit).
+
+ * src/WebViewImpl.cpp:
+ (WebKit::WebViewImpl::resize):
+ (WebKit::WebViewImpl::computePageScaleFactorLimits):
+ * tests/WebFrameTest.cpp:
+
+2013-01-28 Sheriff Bot <[email protected]>
+
Unreviewed, rolling out r140934, r140935, and r140937.
http://trac.webkit.org/changeset/140934
http://trac.webkit.org/changeset/140935
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (141014 => 141015)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2013-01-28 23:05:09 UTC (rev 141014)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2013-01-28 23:07:00 UTC (rev 141015)
@@ -1664,6 +1664,11 @@
#if ENABLE(VIEWPORT)
if (settings()->viewportEnabled()) {
+ if (!settingsImpl()->applyPageScaleFactorInCompositor()) {
+ // Relayout immediately to obtain the new content width, which is needed
+ // to calculate the minimum scale limit.
+ view->layout();
+ }
computePageScaleFactorLimits();
// When the device rotates:
@@ -3096,10 +3101,6 @@
FrameView* view = page()->mainFrame()->view();
- // Layout to refresh to the latest contents width.
- if (view->needsLayout())
- view->layout();
-
m_minimumPageScaleFactor = min(max(m_pageDefinedMinimumPageScaleFactor, minPageScaleFactor), maxPageScaleFactor);
m_maximumPageScaleFactor = max(min(m_pageDefinedMaximumPageScaleFactor, maxPageScaleFactor), minPageScaleFactor);
if (!m_webSettings->applyDeviceScaleFactorInCompositor()) {
Modified: trunk/Source/WebKit/chromium/tests/WebFrameTest.cpp (141014 => 141015)
--- trunk/Source/WebKit/chromium/tests/WebFrameTest.cpp 2013-01-28 23:05:09 UTC (rev 141014)
+++ trunk/Source/WebKit/chromium/tests/WebFrameTest.cpp 2013-01-28 23:07:00 UTC (rev 141015)
@@ -238,8 +238,6 @@
WebView* webView = static_cast<WebView*>(FrameTestHelpers::createWebViewAndLoad(m_baseURL + "no_viewport_tag.html", true, 0, &client));
- webView->settings()->setApplyDeviceScaleFactorInCompositor(true);
- webView->settings()->setApplyPageScaleFactorInCompositor(true);
webView->settings()->setViewportEnabled(true);
webView->enableFixedLayoutMode(true);
webView->resize(WebSize(viewportWidth, viewportHeight));
@@ -247,15 +245,17 @@
EXPECT_EQ(2, webView->deviceScaleFactor());
- // Page scale factor should not be affected by device scale factor.
+ // Device scale factor should be a component of page scale factor in fixed-layout, so a scale of 1 becomes 2.
webView->setPageScaleFactorLimits(1, 2);
- EXPECT_EQ(1, webView->pageScaleFactor());
+ EXPECT_EQ(2, webView->pageScaleFactor());
// Force the layout to happen before leaving the test.
webView->mainFrame()->contentAsText(1024).utf8();
}
-TEST_F(WebFrameTest, FixedLayoutInitializeAtMinimumPageScale)
+// Test is disabled because it started failing after r140025.
+// See bug for details: webkit.org/b/107206.
+TEST_F(WebFrameTest, DISABLED_FixedLayoutInitializeAtMinimumPageScale)
{
registerMockedHttpURLLoad("fixed_layout.html");
@@ -267,8 +267,6 @@
// Make sure we initialize to minimum scale, even if the window size
// only becomes available after the load begins.
WebViewImpl* webViewImpl = static_cast<WebViewImpl*>(FrameTestHelpers::createWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client));
- webViewImpl->settings()->setApplyDeviceScaleFactorInCompositor(true);
- webViewImpl->settings()->setApplyPageScaleFactorInCompositor(true);
webViewImpl->enableFixedLayoutMode(true);
webViewImpl->settings()->setViewportEnabled(true);
webViewImpl->resize(WebSize(viewportWidth, viewportHeight));
