Revert of Revert of Carry out a resize even if no layout has been performed.

Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 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 1675 matching lines @@
     updateMainFrameLayoutSize();
 
     // If the virtual viewport pinch mode is enabled, the main frame will be resized
     // after layout so it can be sized to the contentsSize.
     if (!pinchVirtualViewportEnabled() && mainFrameImpl()->frameView())
         mainFrameImpl()->frameView()->resize(m_size);
 
     if (pinchVirtualViewportEnabled())
         page()->frameHost().pinchViewport().setSize(m_size);
 
+    if (mainFrameImpl()->frameView()) {
+        if (!mainFrameImpl()->frameView()->needsLayout())
+            postLayoutResize(mainFrameImpl());
+    }
+
     // When device emulation is enabled, device size values may change - they are
     // usually set equal to the view size. These values are not considered viewport-dependent
     // (see MediaQueryExp::isViewportDependent), since they are only viewport-dependent in emulation mode,
     // and thus will not be invalidated in |FrameView::performPreLayoutTasks|.
     // Therefore we should force explicit media queries invalidation here.
     if (page()->inspectorController().deviceEmulationEnabled()) {
         if (Document* document = mainFrameImpl()->frame()->document()) {
             document->styleResolverChanged();
             document->mediaQueryAffectingValueChanged();
         }
@@ skipping 2300 matching lines @@
 
 void WebViewImpl::resumeTreeViewCommits()
 {
     if (m_layerTreeViewCommitsDeferred) {
         if (m_layerTreeView)
             m_layerTreeView->setDeferCommits(false);
         m_layerTreeViewCommitsDeferred = false;
     }
 }
 
-void WebViewImpl::layoutUpdated(WebLocalFrameImpl* webframe)
+void WebViewImpl::postLayoutResize(WebLocalFrameImpl* webframe)
 {
-    if (!m_client || !webframe->frame()->isLocalRoot())
-        return;
-
-    // If we finished a layout while in deferred commit mode,
-    // that means it's time to start producing frames again so un-defer.
-    resumeTreeViewCommits();
-
-    if (m_shouldAutoResize && webframe->frame() && webframe->frame()->view()) {
-        WebSize frameSize = webframe->frame()->view()->frameRect().size();
-        if (frameSize != m_size) {
-            m_size = frameSize;
-
-            page()->frameHost().pinchViewport().setSize(m_size);
-            m_pageScaleConstraintsSet.didChangeViewSize(m_size);
-
-            m_client->didAutoResize(m_size);
-            sendResizeEventAndRepaint();
-        }
-    }
-
-    if (m_pageScaleConstraintsSet.constraintsDirty())
-        refreshPageScaleFactorAfterLayout();
-
     FrameView* view = webframe->frame()->view();
-
     if (pinchVirtualViewportEnabled()) {
         if (webframe == mainFrame()) {
             view->resize(mainFrameSize());
         } else {
             view->resize(webframe->frameView()->layoutSize());
         }
     }
+}
+
+void WebViewImpl::layoutUpdated(WebLocalFrameImpl* webframe)
+{
+    if (!m_client || !webframe->frame()->isLocalRoot())
+        return;
+
+    // If we finished a layout while in deferred commit mode,
+    // that means it's time to start producing frames again so un-defer.
+    resumeTreeViewCommits();
+
+    if (m_shouldAutoResize && webframe->frame() && webframe->frame()->view()) {
+        WebSize frameSize = webframe->frame()->view()->frameRect().size();
+        if (frameSize != m_size) {
+            m_size = frameSize;
+
+            page()->frameHost().pinchViewport().setSize(m_size);
+            m_pageScaleConstraintsSet.didChangeViewSize(m_size);
+
+            m_client->didAutoResize(m_size);
+            sendResizeEventAndRepaint();
+        }
+    }
+
+    if (m_pageScaleConstraintsSet.constraintsDirty())
+        refreshPageScaleFactorAfterLayout();
+
+    FrameView* view = webframe->frame()->view();
+
+    postLayoutResize(webframe);
 
     // Relayout immediately to avoid violating the rule that needsLayout()
     // isn't set at the end of a layout.
     if (view->needsLayout())
         view->layout();
 
     // In case we didn't have a size when the top controls were updated.
     didUpdateTopControls();
 
     m_client->didUpdateLayout();
@@ skipping 555 matching lines @@
     return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
         || (constraints.minimumScale == constraints.maximumScale && constraints.minimumScale != -1);
 }
 
 void WebViewImpl::forceNextWebGLContextCreationToFail()
 {
     WebGLRenderingContext::forceNextWebGLContextCreationToFail();
 }
 
 } // namespace blink