Attachment 135194 Details for Bug 82949 – Patch

[patch] Patch

bug-82949-20120402144446.patch (text/plain), 3.23 KB, created by Alexandre Elias on 2012-04-02 14:44:47 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alexandre Elias

Created: 2012-04-02 14:44:47 PDT

Size: 3.23 KB

patch

obsolete

>Subversion Revision: 112713
>diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
>index dbdc91a6ba3c8e79e3108d700b4cbf3df9af071e..02596faeb8e0dc2d3e743e4b32f760071110cb10 100644
>--- a/Source/WebKit/chromium/ChangeLog
>+++ b/Source/WebKit/chromium/ChangeLog
>@@ -1,3 +1,26 @@
>+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.
>+
>+        * src/ChromeClientImpl.cpp:
>+        (WebKit::ChromeClientImpl::dispatchViewportPropertiesDidChange):
>+        * src/WebViewImpl.cpp:
>+        (WebKit::WebViewImpl::didCommitLoad):
>+
> 2012-03-30  Ian Vollick  <vollick@chromium.org>
> 
>         [chromium] Flaky animation unit test CCLayerTreeHostTestSynchronizeAnimationStartTimes
>diff --git a/Source/WebKit/chromium/src/ChromeClientImpl.cpp b/Source/WebKit/chromium/src/ChromeClientImpl.cpp
>index 2308b0ae8a693440876e4b9ad7d0c7b825fff16b..23209811e95b5983b46fc4a78b9326e234558560 100644
>--- a/Source/WebKit/chromium/src/ChromeClientImpl.cpp
>+++ b/Source/WebKit/chromium/src/ChromeClientImpl.cpp
>@@ -669,11 +669,11 @@ 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();
>     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 dcb52bf36d5b49675020050743319541c5ad8369..1450d35a5c7c4680eb31b45439a6f8ebd97dae81 100644
>--- a/Source/WebKit/chromium/src/WebViewImpl.cpp
>+++ b/Source/WebKit/chromium/src/WebViewImpl.cpp
>@@ -2952,7 +2952,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();

Actions: View | Formatted Diff | Diff

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