Changeset 128133 in webkit

Timestamp:

Sep 10, 2012 5:22:06 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[chromium, android] Reloading a page with a different user agent can cause the page to be zoomed in
​https://bugs.webkit.org/show_bug.cgi?id=90222

Patch by Dan Alcantara <​dfalcantara@chromium.org> on 2012-09-10
Reviewed by Adam Barth.

When reloading a page with an overridden URL, the page's scroll and zoom
state will be restored once the reload is complete. This is problematic
in situations when switching between mobile and desktop versions of the
same site because it will zoom back in on a random part of alternate page.
This CL just avoids that situation by resetting the zoom and scale whenever
this type of reload occurs.

Chromium half: ​https://chromiumcodereview.appspot.com/10889019

• public/WebView.h:

(WebView):

• src/WebViewImpl.cpp:

(WebKit::WebViewImpl::resetScrollAndScaleState):
(WebKit):

• src/WebViewImpl.h:

(WebViewImpl):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebView.h (modified) (1 diff)
• src/WebViewImpl.cpp (modified) (1 diff)
• src/WebViewImpl.h (modified) (1 diff)
• tests/WebViewTest.cpp (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-09-10  Dan Alcantara  <dfalcantara@chromium.org>
+
+        [chromium, android] Reloading a page with a different user agent can cause the page to be zoomed in
+        https://bugs.webkit.org/show_bug.cgi?id=90222
+
+        Reviewed by Adam Barth.
+
+        When reloading a page with an overridden URL, the page's scroll and zoom
+        state will be restored once the reload is complete.  This is problematic
+        in situations when switching between mobile and desktop versions of the
+        same site because it will zoom back in on a random part of alternate page.
+        This CL just avoids that situation by resetting the zoom and scale whenever
+        this type of reload occurs.
+
+        Chromium half: https://chromiumcodereview.appspot.com/10889019
+
+        * public/WebView.h:
+        (WebView):
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::resetScrollAndScaleState):
+        (WebKit):
+        * src/WebViewImpl.h:
+        (WebViewImpl):
+
 2012-09-10  Adam Barth  <abarth@chromium.org>
 

trunk/Source/WebKit/chromium/public/WebView.h

@@ -258 +258 @@
     virtual void saveScrollAndScaleState() = 0;
 
-    // Restore the previously saved scroll and scale state. After restroing the
+    // Restore the previously saved scroll and scale state. After restoring the
     // state, this function deletes any saved scroll and scale state.
     virtual void restoreScrollAndScaleState() = 0;
+
+    // Reset the scroll and scale state and clobber any previously saved values for
+    // these parameters.
+    virtual void resetScrollAndScaleState() = 0;
 
     // Prevent the web page from setting a maximum scale via the viewport meta

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

@@ -2929 +2929 @@
 }
 
+void WebViewImpl::resetScrollAndScaleState()
+{
+    page()->setPageScaleFactor(0, IntPoint());
+    m_pageScaleFactorIsSet = false;
+
+    // Clobber saved scales and scroll offsets.
+    if (FrameView* view = page()->mainFrame()->document()->view())
+        view->cacheCurrentScrollPosition();
+    resetSavedScrollAndScaleState();
+    page()->mainFrame()->loader()->history()->saveDocumentAndScrollState();
+}
+
 WebSize WebViewImpl::fixedLayoutSize() const
 {

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

@@ -228 +228 @@
     virtual void saveScrollAndScaleState();
     virtual void restoreScrollAndScaleState();
+    virtual void resetScrollAndScaleState();
     virtual void setIgnoreViewportTagMaximumScale(bool);
 

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

@@ -423 +423 @@
 }
 
+TEST_F(WebViewTest, ResetScrollAndScaleState)
+{
+    URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("hello_world.html"));
+    WebViewImpl* webViewImpl = static_cast<WebViewImpl*>(FrameTestHelpers::createWebViewAndLoad(m_baseURL + "hello_world.html"));
+    webViewImpl->resize(WebSize(640, 480));
+    EXPECT_EQ(0, webViewImpl->mainFrame()->scrollOffset().width);
+    EXPECT_EQ(0, webViewImpl->mainFrame()->scrollOffset().height);
+
+    // Make the page scale and scroll with the given paremeters.
+    webViewImpl->setPageScaleFactor(2.0f, WebPoint(116, 84));
+    EXPECT_EQ(2.0f, webViewImpl->pageScaleFactor());
+    EXPECT_EQ(116, webViewImpl->mainFrame()->scrollOffset().width);
+    EXPECT_EQ(84, webViewImpl->mainFrame()->scrollOffset().height);
+    webViewImpl->page()->mainFrame()->loader()->history()->saveDocumentAndScrollState();
+
+    // Confirm that restoring the page state restores the parameters.
+    webViewImpl->setPageScaleFactor(1.5f, WebPoint(16, 24));
+    EXPECT_EQ(1.5f, webViewImpl->pageScaleFactor());
+    EXPECT_EQ(16, webViewImpl->mainFrame()->scrollOffset().width);
+    EXPECT_EQ(24, webViewImpl->mainFrame()->scrollOffset().height);
+    webViewImpl->page()->mainFrame()->loader()->history()->restoreScrollPositionAndViewState();
+    EXPECT_EQ(2.0f, webViewImpl->pageScaleFactor());
+    EXPECT_EQ(116, webViewImpl->mainFrame()->scrollOffset().width);
+    EXPECT_EQ(84, webViewImpl->mainFrame()->scrollOffset().height);
+    webViewImpl->page()->mainFrame()->loader()->history()->saveDocumentAndScrollState();
+
+    // Confirm that resetting the page state resets both the scale and scroll position, as well
+    // as overwrites the original parameters that were saved to the HistoryController.
+    webViewImpl->resetScrollAndScaleState();
+    EXPECT_EQ(0.0f, webViewImpl->pageScaleFactor());
+    EXPECT_EQ(0, webViewImpl->mainFrame()->scrollOffset().width);
+    EXPECT_EQ(0, webViewImpl->mainFrame()->scrollOffset().height);
+    webViewImpl->page()->mainFrame()->loader()->history()->restoreScrollPositionAndViewState();
+    EXPECT_EQ(0.0f, webViewImpl->pageScaleFactor());
+    EXPECT_EQ(0, webViewImpl->mainFrame()->scrollOffset().width);
+    EXPECT_EQ(0, webViewImpl->mainFrame()->scrollOffset().height);
+    webViewImpl->close();
+}
+
 class ContentDetectorClient : public WebViewClient {
 public: