Changeset 141015 in webkit

Timestamp:

Jan 28, 2013 3:07:00 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

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).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2013-01-28

Source/WebCore:

• page/FrameView.cpp:

(WebCore::FrameView::visibleContentsResized):

• platform/ScrollView.cpp:

(WebCore::ScrollView::setFixedLayoutSize):
(WebCore::ScrollView::setUseFixedLayout):

Source/WebKit/chromium:

• src/WebViewImpl.cpp:

(WebKit::WebViewImpl::resize):
(WebKit::WebViewImpl::computePageScaleFactorLimits):

• tests/WebFrameTest.cpp:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/FrameView.cpp (modified) (1 diff)
• WebCore/platform/ScrollView.cpp (modified) (2 diffs)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/WebViewImpl.cpp (modified) (2 diffs)
• WebKit/chromium/tests/WebFrameTest.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-28  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        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  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -2023 +2023 @@
         return;
 
-    if (!useFixedLayout() && needsLayout())
+    if (needsLayout())
         layout();
 

trunk/Source/WebCore/platform/ScrollView.cpp

@@ -278 +278 @@
     m_fixedLayoutSize = newSize;
     updateScrollbars(scrollOffset());
-    if (m_useFixedLayout)
-        contentsResized();
 }
 
@@ -293 +291 @@
     m_useFixedLayout = enable;
     updateScrollbars(scrollOffset());
-    contentsResized();
 }
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2013-01-28  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        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  <webkit.review.bot@gmail.com>
 

trunk/Source/WebKit/chromium/src/WebViewImpl.cpp

@@ -1665 +1665 @@
 #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();
 
@@ -3097 +3102 @@
     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);

trunk/Source/WebKit/chromium/tests/WebFrameTest.cpp

@@ -239 +239 @@
     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);
@@ -248 +246 @@
     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.
@@ -256 +254 @@
 }
 
-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");
@@ -268 +268 @@
     // 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);