Add DidSaveScrollOrScaleState flag to prevent restoreScrollPositionAndViewState restore from default

third_party/WebKit/Source/core/frame/FrameView.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Dirk Mueller <mueller@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *           (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
@@ skipping 502 matching lines @@
   IntRect paintInvalidationRect = rect;
   paintInvalidationRect.move(
       (layoutItem.borderLeft() + layoutItem.paddingLeft()).toInt(),
       (layoutItem.borderTop() + layoutItem.paddingTop()).toInt());
   // FIXME: We should not allow paint invalidation out of paint invalidation
   // state. crbug.com/457415
   DisablePaintInvalidationStateAsserts paintInvalidationAssertDisabler;
   layoutItem.invalidatePaintRectangle(LayoutRect(paintInvalidationRect));
 }
 
+void FrameView::setScrollAfterSizeChange() {
+  scrollToFragmentAnchor();
+  frame().loader().restoreScrollPositionAndViewState();
+}
+
 void FrameView::setFrameRect(const IntRect& newRect) {
   IntRect oldRect = frameRect();
   if (newRect == oldRect)
     return;
 
   Widget::setFrameRect(newRect);
 
   const bool frameSizeChanged = oldRect.size() != newRect.size();
 
   m_needsScrollbarsUpdate = frameSizeChanged;
   // TODO(wjmaclean): find out why scrollbars fail to resize for complex
   // subframes after changing the zoom level. For now always calling
   // updateScrollbarsIfNeeded() here fixes the issue, but it would be good to
   // discover the deeper cause of this. http://crbug.com/607987.
   updateScrollbarsIfNeeded();
 
   frameRectsChanged();
 
   updateParentScrollableAreaSet();
 
   if (frameSizeChanged) {
     viewportSizeChanged(newRect.width() != oldRect.width(),
                         newRect.height() != oldRect.height());
 
     if (m_frame->isMainFrame())
       m_frame->host()->visualViewport().mainFrameDidChangeSize();
 
-    frame().loader().restoreScrollPositionAndViewState();
+    setScrollAfterSizeChange();
   }
 }
 
 Page* FrameView::page() const {
   return frame().page();
 }
 
 LayoutView* FrameView::layoutView() const {
   return frame().contentLayoutObject();
 }
@@ skipping 100 matching lines @@
   ScrollableArea::contentsResized();
 
   Page* page = frame().page();
   if (!page)
     return;
 
   updateParentScrollableAreaSet();
 
   page->chromeClient().contentsSizeChanged(m_frame.get(), size);
 
-  // Ensure the scrollToFragmentAnchor is called before
-  // restoreScrollPositionAndViewState when reload
-  scrollToFragmentAnchor();
-  frame().loader().restoreScrollPositionAndViewState();
+  setScrollAfterSizeChange();
 }
 
 void FrameView::adjustViewSize() {
   if (m_suppressAdjustViewSize)
     return;
 
   LayoutViewItem layoutViewItem = this->layoutViewItem();
   if (layoutViewItem.isNull())
     return;
 
@@ skipping 4312 matching lines @@
   // This is the top-level frame, so no mapping necessary.
   if (m_frame->isMainFrame())
     return;
 
   LayoutRect viewportIntersectionRect(remoteViewportIntersection());
   transformState.move(
       LayoutSize(-viewportIntersectionRect.x(), -viewportIntersectionRect.y()));
 }
 
 }  // namespace blink