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

third_party/WebKit/Source/web/tests/WebViewTest.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 1659 matching lines @@
   web_view_impl->MainFrameImpl()->SetScrollOffset(WebSize(94, 111));
   EXPECT_EQ(2.0f, web_view_impl->PageScaleFactor());
   EXPECT_EQ(94, web_view_impl->MainFrameImpl()->GetScrollOffset().width);
   EXPECT_EQ(111, web_view_impl->MainFrameImpl()->GetScrollOffset().height);
   LocalFrame* main_frame_local =
       ToLocalFrame(web_view_impl->GetPage()->MainFrame());
   main_frame_local->Loader().SaveScrollState();
   EXPECT_EQ(2.0f, main_frame_local->Loader()
                       .GetDocumentLoader()
                       ->GetHistoryItem()
-                      ->PageScaleFactor());
+                      ->GetScrollAndViewState()
+                      ->page_scale_factor_);
   EXPECT_EQ(94, main_frame_local->Loader()
                     .GetDocumentLoader()
                     ->GetHistoryItem()
-                    ->GetScrollOffset()
-                    .Width());
+                    ->GetScrollAndViewState()
+                    ->scroll_offset_.Width());
   EXPECT_EQ(111, main_frame_local->Loader()
                      .GetDocumentLoader()
                      ->GetHistoryItem()
-                     ->GetScrollOffset()
-                     .Height());
+                     ->GetScrollAndViewState()
+                     ->scroll_offset_.Height());
 
   // Confirm that resetting the page state resets the saved scroll position.
   web_view_impl->ResetScrollAndScaleState();
   EXPECT_EQ(1.0f, web_view_impl->PageScaleFactor());
   EXPECT_EQ(0, web_view_impl->MainFrameImpl()->GetScrollOffset().width);
   EXPECT_EQ(0, web_view_impl->MainFrameImpl()->GetScrollOffset().height);
-  EXPECT_EQ(1.0f, main_frame_local->Loader()
-                      .GetDocumentLoader()
-                      ->GetHistoryItem()
-                      ->PageScaleFactor());
-  EXPECT_EQ(0, main_frame_local->Loader()
-                   .GetDocumentLoader()
-                   ->GetHistoryItem()
-                   ->GetScrollOffset()
-                   .Width());
-  EXPECT_EQ(0, main_frame_local->Loader()
-                   .GetDocumentLoader()
-                   ->GetHistoryItem()
-                   ->GetScrollOffset()
-                   .Height());
+  EXPECT_EQ(nullptr, main_frame_local->Loader()
+                         .GetDocumentLoader()
+                         ->GetHistoryItem()
+                         ->GetScrollAndViewState());
 }
 
 TEST_P(WebViewTest, BackForwardRestoreScroll) {
   RegisterMockedHttpURLLoad("back_forward_restore_scroll.html");
   WebViewBase* web_view_impl = web_view_helper_.InitializeAndLoad(
       base_url_ + "back_forward_restore_scroll.html");
   web_view_impl->Resize(WebSize(640, 480));
   web_view_impl->UpdateAllLifecyclePhases();
 
   // Emulate a user scroll
@@ skipping 2616 matching lines @@
   EXPECT_FALSE(frame_view->VisualViewportSuppliesScrollbars());
   if (RuntimeEnabledFeatures::RootLayerScrollingEnabled()) {
     EXPECT_NE(nullptr,
               frame_view->LayoutViewportScrollableArea()->VerticalScrollbar());
   } else {
     EXPECT_NE(nullptr, frame_view->VerticalScrollbar());
   }
 }
 
 }  // namespace blink