Fix scroll anchoring during viewport resize.

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 154 matching lines @@
 #include "web/FullscreenController.h"
 #include "web/InspectorOverlay.h"
 #include "web/LinkHighlightImpl.h"
 #include "web/PageOverlay.h"
 #include "web/PrerendererClientImpl.h"
 #include "web/ResizeViewportAnchor.h"
 #include "web/RotationViewportAnchor.h"
 #include "web/SpeechRecognitionClientProxy.h"
 #include "web/StorageQuotaClientImpl.h"
 #include "web/ValidationMessageClientImpl.h"
-#include "web/ViewportAnchor.h"
 #include "web/WebDevToolsAgentImpl.h"
 #include "web/WebInputEventConversion.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WebPagePopupImpl.h"
 #include "web/WebPluginContainerImpl.h"
 #include "web/WebRemoteFrameImpl.h"
 #include "web/WebSettingsImpl.h"
 #include "wtf/AutoReset.h"
 #include "wtf/CurrentTime.h"
 #include "wtf/PtrUtil.h"
@@ skipping 284 matching lines @@
 
     setVisibilityState(visibilityState, true);
 
     initializeLayerTreeView();
 
     m_devToolsEmulator = DevToolsEmulator::create(this);
 
     allInstances().add(this);
 
     m_pageImportanceSignals.setObserver(client);
+    m_resizeViewportAnchor = new ResizeViewportAnchor(*m_page);
 }
 
 WebViewImpl::~WebViewImpl()
 {
     DCHECK(!m_page);
 
     // Each highlight uses m_owningWebViewImpl->m_linkHighlightsTimeline
     // in destructor. m_linkHighlightsTimeline might be destroyed earlier
     // than m_linkHighlights.
     DCHECK(m_linkHighlights.isEmpty());
@@ skipping 1360 matching lines @@
         return;
 
     VisualViewport& visualViewport = page()->frameHost().visualViewport();
 
     {
         // This object will save the current visual viewport offset w.r.t. the
         // document and restore it when the object goes out of scope. It's
         // needed since the top controls adjustment will change the maximum
         // scroll offset and we may need to reposition them to keep the user's
         // apparent position unchanged.
-        ResizeViewportAnchor anchor(*view, visualViewport);
+        ResizeViewportAnchor::ResizeScope resizeScope(*m_resizeViewportAnchor);
 
         float topControlsViewportAdjustment =
             topControls().layoutHeight() - topControls().contentOffset();
         visualViewport.setTopControlsAdjustment(topControlsViewportAdjustment);
 
         // Since the FrameView is sized to be the visual viewport at minimum
         // scale, its adjustment must also be scaled by the minimum scale.
         view->setTopControlsViewportAdjustment(
             topControlsViewportAdjustment / minimumPageScaleFactor());
     }
@@ skipping 57 matching lines @@
 
     bool isRotation = settings()->mainFrameResizesAreOrientationChanges()
         && m_size.width && contentsSize().width() && newSize.width != m_size.width && !m_fullscreenController->isFullscreen();
     m_size = newSize;
 
     FloatSize viewportAnchorCoords(viewportAnchorCoordX, viewportAnchorCoordY);
     if (isRotation) {
         RotationViewportAnchor anchor(*view, visualViewport, viewportAnchorCoords, pageScaleConstraintsSet());
         resizeViewWhileAnchored(view, topControlsHeight, topControlsShrinkLayout);
     } else {
-        ResizeViewportAnchor anchor(*view, visualViewport);
+        ResizeViewportAnchor::ResizeScope resizeScope(*m_resizeViewportAnchor);
         resizeViewWhileAnchored(view, topControlsHeight, topControlsShrinkLayout);
     }
     sendResizeEventAndRepaint();
 }
 
 void WebViewImpl::resize(const WebSize& newSize)
 {
     if (m_shouldAutoResize || m_size == newSize)
         return;
 
@@ skipping 2095 matching lines @@
     // Make sure link highlight from previous page is cleared.
     m_linkHighlights.clear();
     endActiveFlingAnimation();
     m_userGestureObserved = false;
 }
 
 void WebViewImpl::postLayoutResize(WebLocalFrameImpl* webframe)
 {
     FrameView* view = webframe->frame()->view();
     if (webframe == mainFrame())
-        view->resize(mainFrameSize());
+        m_resizeViewportAnchor->resizeFrameView(mainFrameSize());
     else
         view->resize(webframe->frameView()->size());
 }
 
 void WebViewImpl::layoutUpdated(WebLocalFrameImpl* webframe)
 {
     LocalFrame* frame = webframe->frame();
     if (!m_client || !frame->isLocalRoot())
         return;
 
@@ skipping 545 matching lines @@
         return nullptr;
     return focusedFrame;
 }
 
 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const
 {
     return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr;
 }
 
 } // namespace blink