Changing scroll and view state in onpopstate shouldn't overwrite back/forward state restore

third_party/WebKit/Source/web/tests/VisualViewportTest.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/frame/VisualViewport.h"
 
 #include "core/dom/Document.h"
 #include "core/frame/BrowserControls.h"
 #include "core/frame/FrameTestHelpers.h"
 #include "core/frame/LocalFrame.h"
@@ skipping 851 matching lines @@
 // Test that the HistoryItem for the page stores the visual viewport's offset
 // and scale.
 TEST_P(VisualViewportTest, TestSavedToHistoryItem) {
   InitializeWithDesktopSettings();
   WebViewImpl()->Resize(IntSize(200, 300));
   WebViewImpl()->UpdateAllLifecyclePhases();
 
   RegisterMockedHttpURLLoad("200-by-300.html");
   NavigateTo(base_url_ + "200-by-300.html");
 
-  EXPECT_SIZE_EQ(ScrollOffset(0, 0),
-                 ToLocalFrame(WebViewImpl()->GetPage()->MainFrame())
-                     ->Loader()
-                     .GetDocumentLoader()
-                     ->GetHistoryItem()
-                     ->VisualViewportScrollOffset());
+  EXPECT_EQ(nullptr, ToLocalFrame(WebViewImpl()->GetPage()->MainFrame())
+                         ->Loader()
+                         .GetDocumentLoader()
+                         ->GetHistoryItem()
+                         ->GetScrollAndViewState());
 
   VisualViewport& visual_viewport = GetFrame()->GetPage()->GetVisualViewport();
   visual_viewport.SetScale(2);
 
   EXPECT_EQ(2, ToLocalFrame(WebViewImpl()->GetPage()->MainFrame())
                    ->Loader()
                    .GetDocumentLoader()
                    ->GetHistoryItem()
-                   ->PageScaleFactor());
+                   ->GetScrollAndViewState()
+                   ->page_scale_factor_);
 
   visual_viewport.SetLocation(FloatPoint(10, 20));
 
   EXPECT_SIZE_EQ(ScrollOffset(10, 20),
                  ToLocalFrame(WebViewImpl()->GetPage()->MainFrame())
                      ->Loader()
                      .GetDocumentLoader()
                      ->GetHistoryItem()
-                     ->VisualViewportScrollOffset());
+                     ->GetScrollAndViewState()
+                     ->visual_viewport_scroll_offset_);
 }
 
 // Test restoring a HistoryItem properly restores the visual viewport's state.
 TEST_P(VisualViewportTest, TestRestoredFromHistoryItem) {
   InitializeWithDesktopSettings();
   WebViewImpl()->Resize(IntSize(200, 300));
 
   RegisterMockedHttpURLLoad("200-by-300.html");
 
   WebHistoryItem item;
@@ skipping 67 matching lines @@
   VisualViewport& visual_viewport = GetFrame()->GetPage()->GetVisualViewport();
   visual_viewport.SetScale(2);
   visual_viewport.SetLocation(FloatPoint(350, 350));
 
   Persistent<HistoryItem> firstItem = WebViewImpl()
                                           ->MainFrameImpl()
                                           ->GetFrame()
                                           ->Loader()
                                           .GetDocumentLoader()
                                           ->GetHistoryItem();
-  EXPECT_SIZE_EQ(ScrollOffset(0, 1000), firstItem->GetScrollOffset());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 1000),
+                 firstItem->GetScrollAndViewState()->scroll_offset_);
 
   // Now navigate to a page which causes a smaller frame_view. Make sure that
   // navigating doesn't cause the history item to set a new scroll offset
   // before the item was replaced.
   NavigateTo("about:blank");
   frame_view = WebViewImpl()->MainFrameImpl()->GetFrameView();
 
   EXPECT_NE(firstItem, WebViewImpl()
                            ->MainFrameImpl()
                            ->GetFrame()
                            ->Loader()
                            .GetDocumentLoader()
                            ->GetHistoryItem());
   EXPECT_LT(frame_view->FrameRect().Size().Width(), 1000);
-  EXPECT_SIZE_EQ(ScrollOffset(0, 1000), firstItem->GetScrollOffset());
+  EXPECT_SIZE_EQ(ScrollOffset(0, 1000),
+                 firstItem->GetScrollAndViewState()->scroll_offset_);
 }
 
 // Test that the coordinates sent into moveRangeSelection are offset by the
 // visual viewport's location.
 TEST_P(VisualViewportTest,
        DISABLED_TestWebFrameRangeAccountsForVisualViewportScroll) {
   InitializeWithDesktopSettings();
   WebViewImpl()->GetSettings()->SetDefaultFontSize(12);
   WebViewImpl()->Resize(WebSize(640, 480));
   RegisterMockedHttpURLLoad("move_range.html");
@@ skipping 1411 matching lines @@
                                    "    margin: 0px;"
                                    "  }"
                                    "  div { height:110vh; width: 110vw; }"
                                    "</style>"
                                    "<div></div>",
                                    base_url);
 }
 
 }  // namespace
 }  // namespace blink