Make window.innerWidth and innerHeight cause layout if needed.

Source/web/tests/PinchViewportTest.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "core/frame/PinchViewport.h"
 
 #include "core/dom/Document.h"
 #include "core/frame/FrameHost.h"
@@ skipping 15 matching lines @@
 #include "public/web/WebFrameClient.h"
 #include "public/web/WebInputEvent.h"
 #include "public/web/WebScriptSource.h"
 #include "public/web/WebSettings.h"
 #include "public/web/WebViewClient.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/tests/FrameTestHelpers.h"
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
+#include <string>
+
 #define ASSERT_POINT_EQ(expected, actual) \
     do { \
         ASSERT_EQ((expected).x(), (actual).x()); \
         ASSERT_EQ((expected).y(), (actual).y()); \
     } while (false)
 
 #define EXPECT_POINT_EQ(expected, actual) \
     do { \
         EXPECT_EQ((expected).x(), (actual).x()); \
         EXPECT_EQ((expected).y(), (actual).y()); \
@@ skipping 1660 matching lines @@
     EXPECT_FLOAT_POINT_EQ(FloatPoint(50.5, 62.4), pinchViewport.viewportToRootFrame(FloatPoint(81, 100.8)));
     EXPECT_FLOAT_POINT_EQ(FloatPoint(81, 100.8), pinchViewport.rootFrameToViewport(FloatPoint(50.5, 62.4)));
 
 
     // Scrolling the main frame should have no effect.
     frameView.scrollTo(DoublePoint(100, 120));
     EXPECT_FLOAT_POINT_EQ(FloatPoint(50, 62), pinchViewport.viewportToRootFrame(FloatPoint(80, 100)));
     EXPECT_FLOAT_POINT_EQ(FloatPoint(80, 100), pinchViewport.rootFrameToViewport(FloatPoint(50, 62)));
 }
 
+// Tests that the window dimensions are available before a full layout occurs.
+// More specifically, it checks that the innerWidth and innerHeight window
+// properties will trigger a layout which will cause an update to viewport
+// constraints and a refreshed initial scale. crbug.com/466718
+TEST_F(PinchViewportTest, WindowDimensionsOnLoad)
+{
+    initializeWithAndroidSettings();
+    registerMockedHttpURLLoad("window_dimensions.html");
+    webViewImpl()->resize(IntSize(800, 600));
+    navigateTo(m_baseURL + "window_dimensions.html");
+
+    Element* output = frame()->document()->getElementById("output");
+    ASSERT(output);
+    EXPECT_EQ(std::string("1600x1200"), std::string(output->innerHTML().ascii().data()));
+}
+
+// Similar to above but make sure the initial scale is updated with the content
+// width for a very wide page. That is, make that innerWidth/Height actually
+// trigger a layout of the content, and not just an update of the viepwort.
+// crbug.com/466718
+TEST_F(PinchViewportTest, WindowDimensionsOnLoadWideContent)
+{
+    initializeWithAndroidSettings();
+    registerMockedHttpURLLoad("window_dimensions_wide_div.html");
+    webViewImpl()->resize(IntSize(800, 600));
+    navigateTo(m_baseURL + "window_dimensions_wide_div.html");
+
+    Element* output = frame()->document()->getElementById("output");
+    ASSERT(output);
+    EXPECT_EQ(std::string("2000x1500"), std::string(output->innerHTML().ascii().data()));
+}
+
 } // namespace