Reconstrain zoom value to the [min-zoom, max-zoom] range before it used

third_party/WebKit/Source/web/tests/ViewportTest.cpp

Index: third_party/WebKit/Source/web/tests/ViewportTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/ViewportTest.cpp b/third_party/WebKit/Source/web/tests/ViewportTest.cpp
index 4b61d724ad390605cc9acc1fed995e6040c3e454..6b957ce18a14be8ff1af5186ce33c6715875b4da 100644
--- a/third_party/WebKit/Source/web/tests/ViewportTest.cpp
+++ b/third_party/WebKit/Source/web/tests/ViewportTest.cpp
@@ -2914,24 +2914,31 @@ TEST_F(ViewportTest, viewportLimitsAdjustedForNoUserScale) {
       m_baseURL + "viewport/viewport-limits-adjusted-for-no-user-scale.html",
       true, nullptr, nullptr, nullptr, setViewportSettings);
 
+  webViewHelper.webView()->updateAllLifecyclePhases();
   Page* page = webViewHelper.webView()->page();
+  PageScaleConstraints constraints = runViewportTest(page, 10, 10);
 
   EXPECT_FALSE(page->viewportDescription().userZoom);
+  EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f);
+  EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
 }
 
-TEST_F(ViewportTest, viewportLimitsAdjustedForNoUserScaleControl) {
+TEST_F(ViewportTest, viewportLimitsAdjustedForUserScale) {

[bokan, 2016/10/31 13:58:19]

Good catch!

   registerMockedHttpURLLoad(
-      "viewport/viewport-limits-adjusted-for-no-user-scale-control.html");
+      "viewport/viewport-limits-adjusted-for-user-scale.html");
 
   FrameTestHelpers::WebViewHelper webViewHelper;
   webViewHelper.initializeAndLoad(
-      m_baseURL +
-          "viewport/viewport-limits-adjusted-for-no-user-scale-control.html",
-      true, nullptr, nullptr, nullptr, setViewportSettings);
+      m_baseURL + "viewport/viewport-limits-adjusted-for-user-scale.html", true,
+      nullptr, nullptr, nullptr, setViewportSettings);
 
+  webViewHelper.webView()->updateAllLifecyclePhases();
   Page* page = webViewHelper.webView()->page();
+  PageScaleConstraints constraints = runViewportTest(page, 10, 10);
 
   EXPECT_TRUE(page->viewportDescription().userZoom);
+  EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f);
+  EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f);
 }
 
 TEST_F(ViewportTest, viewportTriggersGpuRasterization) {