Preserve page resize information when main frame is remote

third_party/WebKit/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 1884 matching lines @@
     view->setTopControlsViewportAdjustment(topControlsViewportAdjustment / minimumPageScaleFactor());
 }
 
 TopControls& WebViewImpl::topControls()
 {
     return page()->frameHost().topControls();
 }
 
 void WebViewImpl::resizeViewWhileAnchored(FrameView* view)
 {
-    // FIXME: TextAutosizer does not yet support out-of-process frames.
-    if (mainFrameImpl() && mainFrameImpl()->frame()->isLocalFrame()) {
+    ASSERT(mainFrameImpl() && mainFrameImpl()->frame()->isLocalFrame());
+
+    {
         // Avoids unnecessary invalidations while various bits of state in TextAutosizer are updated.
         TextAutosizer::DeferUpdatePageInfo deferUpdatePageInfo(page());
         performResize();
-    } else {
-        performResize();
     }
 
     m_fullscreenController->updateSize();
 
     // Relayout immediately to recalculate the minimum scale limit for rotation anchoring.
     if (view->needsLayout())
         view->layout();
 }
 
 void WebViewImpl::resize(const WebSize& newSize)
 {
     if (m_shouldAutoResize || m_size == newSize)
         return;
 
+    if (page()->mainFrame() && !page()->mainFrame()->isLocalFrame()) {
+        // Viewport resize for a remote main frame does not require any
+        // particular action, but the state needs to reflect the correct size
+        // so that it can be used for initalization if the main frame gets
+        // swapped to a LocalFrame at a later time.
+        m_size = newSize;
+        pageScaleConstraintsSet().didChangeViewSize(m_size);
+        page()->frameHost().visualViewport().setSize(m_size);
+        return;
+    }
+
     WebLocalFrameImpl* mainFrame = mainFrameImpl();
     if (!mainFrame)
         return;
 
     FrameView* view = mainFrame->frameView();
     if (!view)
         return;
 
     VisualViewport& visualViewport = page()->frameHost().visualViewport();
 
@@ skipping 2690 matching lines @@
 void WebViewImpl::detachPaintArtifactCompositor()
 {
     if (!m_layerTreeView)
         return;
 
     m_layerTreeView->setDeferCommits(true);
     m_layerTreeView->clearRootLayer();
 }
 
 } // namespace blink