Attachment 142438 Details for Bug 82949 – Patch

[patch] Patch

bug-82949-20120517010324.patch (text/plain), 6.40 KB, created by Alexandre Elias on 2012-05-17 01:03:25 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alexandre Elias

Created: 2012-05-17 01:03:25 PDT

Size: 6.40 KB

patch

obsolete

>Subversion Revision: 117312
>diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
>index 1187b64cc50cfb5acc035182734b8cb638d6e693..12fb48ad2b9470a7fe739fdad5fa253ffaa6e64f 100644
>--- a/Source/WebKit/chromium/ChangeLog
>+++ b/Source/WebKit/chromium/ChangeLog
>@@ -1,3 +1,28 @@
>+2012-04-02  Alexandre Elias  <aelias@google.com>
>+
>+        [chromium] Apply viewport tag initial-scale only once
>+        https://bugs.webkit.org/show_bug.cgi?id=82949
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        First, check that isPageScaleFactorSet return false before setting
>+        initial-scale. We need to call dispatchViewportPropertiesDidChange()
>+        when the viewport width changes, since that's an input to the viewport
>+        tag calculation. When this happens, we shouldn't pop back to initial
>+        scale.
>+
>+        Second, check that isNewNavigation is true when deciding to clear
>+        isPageScaleFactorIsSet in didCommitLoad. We only want to clear it on
>+        the very first commit, otherwise we'll pop back to initial scale if
>+        the user zooms in before the load is complete.
>+
>+        New test WebFrameTest::FixedLayoutInitializeAtMinimumPageScale.
>+
>+        * src/ChromeClientImpl.cpp:
>+        (WebKit::ChromeClientImpl::dispatchViewportPropertiesDidChange):
>+        * src/WebViewImpl.cpp:
>+        (WebKit::WebViewImpl::didCommitLoad):
>+
> 2012-05-16  Yury Semikhatsky  <yurys@chromium.org>
> 
>         [Chromium] Web Inspector: DevToolsSanityTest.TestScriptsTabIsPopulatedOnInspectedPageRefresh is broken
>diff --git a/Source/WebKit/chromium/src/ChromeClientImpl.cpp b/Source/WebKit/chromium/src/ChromeClientImpl.cpp
>index 70d565c2eedb8ca98ebc0c55245bb726c78ee42c..ecd4961a2890200a543ea79550cb75a076e0a295 100644
>--- a/Source/WebKit/chromium/src/ChromeClientImpl.cpp
>+++ b/Source/WebKit/chromium/src/ChromeClientImpl.cpp
>@@ -665,14 +665,14 @@ void ChromeClientImpl::dispatchViewportPropertiesDidChange(const ViewportArgumen
>     int layoutHeight = computed.layoutSize.height();
>     m_webView->setFixedLayoutSize(IntSize(layoutWidth, layoutHeight));
> 
>-    // FIXME: Investigate the impact this has on layout/rendering if any.
>-    // This exposes the correct device scale to javascript and media queries.
>+    bool needInitializePageScale = !m_webView->isPageScaleFactorSet();
>     if (useDefaultDeviceScaleFactor && settings->defaultDeviceScaleFactor())
>         m_webView->setDeviceScaleFactor(settings->defaultDeviceScaleFactor());
>     else
>         m_webView->setDeviceScaleFactor(computed.devicePixelRatio);
>     m_webView->setPageScaleFactorLimits(computed.minimumScale, computed.maximumScale);
>-    m_webView->setPageScaleFactorPreservingScrollOffset(computed.initialScale * computed.devicePixelRatio);
>+    if (needInitializePageScale)
>+        m_webView->setPageScaleFactorPreservingScrollOffset(computed.initialScale * computed.devicePixelRatio);
> #endif
> }
> 
>diff --git a/Source/WebKit/chromium/src/WebViewImpl.cpp b/Source/WebKit/chromium/src/WebViewImpl.cpp
>index a00e2b54484d55e33862161c8f93701d4ac2214e..9f8912e046e4442b2f43b9c0115093f10b190531 100644
>--- a/Source/WebKit/chromium/src/WebViewImpl.cpp
>+++ b/Source/WebKit/chromium/src/WebViewImpl.cpp
>@@ -2973,7 +2973,7 @@ void WebViewImpl::didCommitLoad(bool* isNewNavigation, bool isNavigationWithinPa
>     m_newNavigationLoader = 0;
> #endif
>     m_observedNewNavigation = false;
>-    if (!isNavigationWithinPage)
>+    if (*isNewNavigation && !isNavigationWithinPage)
>         m_pageScaleFactorIsSet = false;
> 
>     m_gestureAnimation.clear();
>diff --git a/Source/WebKit/chromium/tests/WebFrameTest.cpp b/Source/WebKit/chromium/tests/WebFrameTest.cpp
>index f687a8485429e9f12585e5561a10756f2dfa97bc..11b949e296a830ed35fd8608eae81e91d481a755 100644
>--- a/Source/WebKit/chromium/tests/WebFrameTest.cpp
>+++ b/Source/WebKit/chromium/tests/WebFrameTest.cpp
>@@ -31,12 +31,14 @@
> #include "config.h"
> 
> #include "FrameTestHelpers.h"
>+#include "FrameView.h"
> #include "ResourceError.h"
> #include "WebDocument.h"
> #include "WebFindOptions.h"
> #include "WebFormElement.h"
> #include "WebFrame.h"
> #include "WebFrameClient.h"
>+#include "WebFrameImpl.h"
> #include "WebRange.h"
> #include "WebScriptSource.h"
> #include "WebSearchableFormData.h"
>@@ -234,6 +236,43 @@ TEST_F(WebFrameTest, DeviceScaleFactorUsesDefaultWithoutViewportTag)
> 
>     EXPECT_EQ(2, webView->deviceScaleFactor());
> }
>+
>+TEST_F(WebFrameTest, FixedLayoutInitializeAtMinimumPageScale)
>+{
>+    registerMockedHttpURLLoad("fixed_layout.html");
>+
>+    FixedLayoutTestWebViewClient client;
>+    client.m_screenInfo.horizontalDPI = 160;
>+    int viewportWidth = 640;
>+    int viewportHeight = 480;
>+    client.m_windowRect = WebRect(0, 0, viewportWidth, viewportHeight);
>+
>+    // 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->enableFixedLayoutMode(true);
>+    webViewImpl->settings()->setViewportEnabled(true);
>+    webViewImpl->resize(WebSize(viewportWidth, viewportHeight));
>+
>+    int defaultFixedLayoutWidth = 980;
>+    float minimumPageScaleFactor = viewportWidth / (float) defaultFixedLayoutWidth;
>+    EXPECT_EQ(minimumPageScaleFactor, webViewImpl->pageScaleFactor());
>+
>+    // Assume the user has pinch zoomed to page scale factor 2.
>+    float userPinchPageScaleFactor = 2;
>+    webViewImpl->setPageScaleFactorPreservingScrollOffset(userPinchPageScaleFactor);
>+    webViewImpl->mainFrameImpl()->frameView()->layout();
>+
>+    // Make sure we don't reset to initial scale if the page continues to load.
>+    bool isNewNavigation;
>+    webViewImpl->didCommitLoad(&isNewNavigation, false);
>+    webViewImpl->didChangeContentsSize();
>+    EXPECT_EQ(userPinchPageScaleFactor, webViewImpl->pageScaleFactor());
>+
>+    // Make sure we don't reset to initial scale if the viewport size changes.
>+    webViewImpl->resize(WebSize(viewportWidth, viewportHeight + 100));
>+    EXPECT_EQ(userPinchPageScaleFactor, webViewImpl->pageScaleFactor());
>+}
> #endif
> 
> #if ENABLE(GESTURE_EVENTS)
>diff --git a/Source/WebKit/chromium/tests/data/fixed_layout.html b/Source/WebKit/chromium/tests/data/fixed_layout.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..a89cecae928e75e15edddfad11e1d97d6ded65c7
>--- /dev/null
>+++ b/Source/WebKit/chromium/tests/data/fixed_layout.html
>@@ -0,0 +1 @@
>+<body>Ordinary non-mobile page</body>

Actions: View | Formatted Diff | Diff

Attachments on bug 82949: 135194 | 135234 | 135238 | 142438 | 143427 | 143433