Reset page scale factor to 1.0 on navigation to a new page.

Source/WebKit/chromium/src/WebViewImpl.cpp

Index: Source/WebKit/chromium/src/WebViewImpl.cpp
diff --git a/Source/WebKit/chromium/src/WebViewImpl.cpp b/Source/WebKit/chromium/src/WebViewImpl.cpp
index 73aaf97d0864969a9a4c5ef4abe069e83211c8b6..7ccf33fcdf108a6d1be9ae868a0903a4f805d0c1 100644
--- a/Source/WebKit/chromium/src/WebViewImpl.cpp
+++ b/Source/WebKit/chromium/src/WebViewImpl.cpp
@@ -3663,24 +3663,22 @@ void WebViewImpl::layoutUpdated(WebFrameImpl* webframe)
         }
     }
 
-    if (settings()->viewportEnabled()) {
-        if (!isPageScaleFactorSet()) {
-            // If the viewport tag failed to be processed earlier, we need
-            // to recompute it now.
-            ViewportArguments viewportArguments = mainFrameImpl()->frame()->document()->viewportArguments();
-            m_page->chrome()->client()->dispatchViewportPropertiesDidChange(viewportArguments);
-        }
+    if (settings()->viewportEnabled() && !isPageScaleFactorSet()) {
+        // If the viewport tag failed to be processed earlier, we need
+        // to recompute it now.
+        ViewportArguments viewportArguments = mainFrameImpl()->frame()->document()->viewportArguments();
+        m_page->chrome()->client()->dispatchViewportPropertiesDidChange(viewportArguments);
+    }
 
-        // Contents size is an input to the page scale limits, so a good time to
-        // recalculate is after layout has occurred.
-        computePageScaleFactorLimits();
+    // Contents size is an input to the page scale limits, so a good time to
+    // recalculate is after layout has occurred.
+    computePageScaleFactorLimits();
 
-        // Relayout immediately to avoid violating the rule that needsLayout()
-        // isn't set at the end of a layout.
-        FrameView* view = mainFrameImpl()->frameView();
-        if (view && view->needsLayout())
-            view->layout();
-    }
+    // Relayout immediately to avoid violating the rule that needsLayout()
+    // isn't set at the end of a layout.
+    FrameView* view = mainFrameImpl()->frameView();
+    if (view && view->needsLayout())
+        view->layout();
 
     m_client->didUpdateLayout();