Make window.innerWidth and innerHeight cause layout if needed.

Source/core/frame/LocalDOMWindow.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 914 matching lines @@
 
     FrameHost* host = frame()->host();
     if (!host)
         return 0;
 
     if (host->settings().reportScreenSizeInPhysicalPixelsQuirk())
         return lroundf(host->chrome().windowRect().width() * host->deviceScaleFactor());
     return host->chrome().windowRect().width();
 }
 
+static FloatSize getViewportSize(LocalFrame* frame)
+{
+    FrameView* view = frame->view();
+    if (!view)
+        return FloatSize();
+
+    FrameHost* host = frame->host();
+    if (!host)
+        return FloatSize();
+
+    // The main frame's viewport size depends on the page scale. Since the
+    // initial page scale depends on the content width and is set after a
+    // layout, perform one now so queries during page load will use the up to
+    // date viewport.
+    if (host->settings().viewportEnabled() && frame->isMainFrame())
+        frame->document()->updateLayoutIgnorePendingStylesheets();
+
+    // FIXME: This is potentially too much work. We really only need to know the dimensions of the parent frame's renderer.
+    if (Frame* parent = frame->tree().parent()) {
+        if (parent && parent->isLocalFrame())
+            toLocalFrame(parent)->document()->updateLayoutIgnorePendingStylesheets();
+    }
+
+    return frame->isMainFrame()
+        ? host->pinchViewport().visibleRect().size()
+        : view->visibleContentRect(IncludeScrollbars).size();
+}
+
 int LocalDOMWindow::innerHeight() const
 {
     if (!frame())
         return 0;
 
-    FrameView* view = frame()->view();
-    if (!view)
-        return 0;
-
-    FrameHost* host = frame()->host();
-    if (!host)
-        return 0;
-
-    // FIXME: This is potentially too much work. We really only need to know the dimensions of the parent frame's renderer.
-    if (Frame* parent = frame()->tree().parent()) {
-        if (parent && parent->isLocalFrame())
-            toLocalFrame(parent)->document()->updateLayoutIgnorePendingStylesheets();
-    }
-
-    FloatSize viewportSize = frame()->isMainFrame()
-        ? host->pinchViewport().visibleRect().size()
-        : view->visibleContentRect(IncludeScrollbars).size();
-
+    FloatSize viewportSize = getViewportSize(frame());
     return adjustForAbsoluteZoom(expandedIntSize(viewportSize).height(), frame()->pageZoomFactor());
 }
 
 int LocalDOMWindow::innerWidth() const
 {
     if (!frame())
         return 0;
 
-    FrameView* view = frame()->view();
-    if (!view)
-        return 0;
-
-    FrameHost* host = frame()->host();
-    if (!host)
-        return 0;
-
-    // FIXME: This is potentially too much work. We really only need to know the dimensions of the parent frame's renderer.
-    if (Frame* parent = frame()->tree().parent()) {
-        if (parent && parent->isLocalFrame())
-            toLocalFrame(parent)->document()->updateLayoutIgnorePendingStylesheets();
-    }
-
-    FloatSize viewportSize = frame()->isMainFrame()
-        ? host->pinchViewport().visibleRect().size()
-        : view->visibleContentRect(IncludeScrollbars).size();
-
+    FloatSize viewportSize = getViewportSize(frame());
     return adjustForAbsoluteZoom(expandedIntSize(viewportSize).width(), frame()->pageZoomFactor());
 }
 
 int LocalDOMWindow::screenX() const
 {
     if (!frame())
         return 0;
 
     FrameHost* host = frame()->host();
     if (!host)
@@ skipping 672 matching lines @@
     return m_frameObserver->frame();
 }
 
 v8::Handle<v8::Object> LocalDOMWindow::wrap(v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
 {
     ASSERT_NOT_REACHED(); // LocalDOMWindow has [Custom=ToV8].
     return v8::Handle<v8::Object>();
 }
 
 } // namespace blink