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

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

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 2896 matching lines @@
 
 TEST_F(ViewportTest, viewportLimitsAdjustedForNoUserScale) {
   registerMockedHttpURLLoad(
       "viewport/viewport-limits-adjusted-for-no-user-scale.html");
 
   FrameTestHelpers::WebViewHelper webViewHelper;
   webViewHelper.initializeAndLoad(
       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) {
   FrameTestHelpers::WebViewHelper webViewHelper;
 
   registerMockedHttpURLLoad(
       "viewport/viewport-gpu-rasterization-disabled-without-viewport.html");
   webViewHelper.initializeAndLoad(
       m_baseURL +
           "viewport/viewport-gpu-rasterization-disabled-without-viewport.html",
@@ skipping 254 matching lines @@
       m_baseURL + "viewport/viewport-warnings-7.html", true, &webFrameClient,
       nullptr, nullptr, setViewportSettings);
 
   Page* page = webViewHelper.webView()->page();
   runViewportTest(page, 320, 352);
 
   EXPECT_EQ(0U, webFrameClient.messages.size());
 }
 
 }  // namespace blink