Preserve page resize information when main frame is remote

third_party/WebKit/Source/core/frame/VisualViewport.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 71 matching lines @@
 }
 
 DEFINE_TRACE(VisualViewport)
 {
     visitor->trace(m_frameHost);
     ScrollableArea::trace(visitor);
 }
 
 void VisualViewport::setSize(const IntSize& size)
 {
-    // When the main frame is remote, we won't have an associated frame.
-    if (!mainFrame())
-        return;
-
     if (m_size == size)
         return;
 
-    bool autosizerNeedsUpdating =
-        (size.width() != m_size.width())
+    bool autosizerNeedsUpdating = (size.width() != m_size.width())
+        && mainFrame()
         && mainFrame()->settings()
         && mainFrame()->settings()->textAutosizingEnabled();
 
     TRACE_EVENT2("blink", "VisualViewport::setSize", "width", size.width(), "height", size.height());
     m_size = size;
 
     if (m_innerViewportContainerLayer) {
         m_innerViewportContainerLayer->setSize(FloatSize(m_size));
 
         // Need to re-compute sizes for the overlay scrollbars.
@@ skipping 76 matching lines @@
     setLocation(m_offset + delta);
 }
 
 void VisualViewport::setScale(float scale)
 {
     setScaleAndLocation(scale, m_offset);
 }
 
 void VisualViewport::setScaleAndLocation(float scale, const FloatPoint& location)
 {
-    if (!mainFrame())
-        return;
-
     bool valuesChanged = false;
 
     if (scale != m_scale) {
         m_scale = scale;
         valuesChanged = true;
         frameHost().chromeClient().pageScaleFactorChanged();
     }
 
+    if (!mainFrame())
+        return;
+
     FloatPoint clampedOffset(clampOffsetToBoundaries(location));
 
     if (clampedOffset != m_offset) {
         m_offset = clampedOffset;
         scrollAnimator().setCurrentPosition(m_offset);
 
         // SVG runs with accelerated compositing disabled so no ScrollingCoordinator.
         if (ScrollingCoordinator* coordinator = frameHost().page().scrollingCoordinator())
             coordinator->scrollableAreaScrollLayerDidChange(this);
 
@@ skipping 521 matching lines @@
     } else if (graphicsLayer == m_rootTransformLayer) {
         name =  "Root Transform Layer";
     } else {
         ASSERT_NOT_REACHED();
     }
 
     return name;
 }
 
 } // namespace blink