Move HistoryItem handling to DocumentLoader

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/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/html/HTMLBodyElement.h"
 #include "core/html/HTMLElement.h"
 #include "core/input/EventHandler.h"
 #include "core/layout/LayoutObject.h"
 #include "core/layout/api/LayoutViewItem.h"
 #include "core/layout/compositing/PaintLayerCompositor.h"
+#include "core/loader/DocumentLoader.h"
 #include "core/page/Page.h"
 #include "core/paint/PaintLayer.h"
 #include "platform/geometry/DoublePoint.h"
 #include "platform/geometry/DoubleRect.h"
 #include "platform/graphics/CompositorElementId.h"
 #include "platform/testing/RuntimeEnabledFeaturesTestHelpers.h"
 #include "platform/testing/URLTestHelpers.h"
 #include "platform/testing/UnitTestHelpers.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebCachePolicy.h"
@@ skipping 842 matching lines @@
   initializeWithDesktopSettings();
   webViewImpl()->resize(IntSize(200, 300));
   webViewImpl()->updateAllLifecyclePhases();
 
   registerMockedHttpURLLoad("200-by-300.html");
   navigateTo(m_baseURL + "200-by-300.html");
 
   EXPECT_SIZE_EQ(ScrollOffset(0, 0),
                  toLocalFrame(webViewImpl()->page()->mainFrame())
                      ->loader()
-                     .currentItem()
+                     .documentLoader()
+                     ->historyItem()
                      ->visualViewportScrollOffset());
 
   VisualViewport& visualViewport = frame()->page()->visualViewport();
   visualViewport.setScale(2);
 
   EXPECT_EQ(2, toLocalFrame(webViewImpl()->page()->mainFrame())
                    ->loader()
-                   .currentItem()
+                   .documentLoader()
+                   ->historyItem()
                    ->pageScaleFactor());
 
   visualViewport.setLocation(FloatPoint(10, 20));
 
   EXPECT_SIZE_EQ(ScrollOffset(10, 20),
                  toLocalFrame(webViewImpl()->page()->mainFrame())
                      ->loader()
-                     .currentItem()
+                     .documentLoader()
+                     ->historyItem()
                      ->visualViewportScrollOffset());
 }
 
 // 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");
 
@@ skipping 62 matching lines @@
   FrameView* frameView = webViewImpl()->mainFrameImpl()->frameView();
   frameView->layoutViewportScrollableArea()->setScrollOffset(
       ScrollOffset(0, 1000), ProgrammaticScroll);
 
   EXPECT_SIZE_EQ(IntSize(1000, 1000), frameView->frameRect().size());
 
   VisualViewport& visualViewport = frame()->page()->visualViewport();
   visualViewport.setScale(2);
   visualViewport.setLocation(FloatPoint(350, 350));
 
-  Persistent<HistoryItem> firstItem =
-      webViewImpl()->mainFrameImpl()->frame()->loader().currentItem();
+  Persistent<HistoryItem> firstItem = webViewImpl()
+                                          ->mainFrameImpl()
+                                          ->frame()
+                                          ->loader()
+                                          .documentLoader()
+                                          ->historyItem();
   EXPECT_SIZE_EQ(ScrollOffset(0, 1000), firstItem->getScrollOffset());
 
   // Now navigate to a page which causes a smaller frameView. Make sure that
   // navigating doesn't cause the history item to set a new scroll offset
   // before the item was replaced.
   navigateTo("about:blank");
   frameView = webViewImpl()->mainFrameImpl()->frameView();
 
-  EXPECT_NE(firstItem,
-            webViewImpl()->mainFrameImpl()->frame()->loader().currentItem());
+  EXPECT_NE(firstItem, webViewImpl()
+                           ->mainFrameImpl()
+                           ->frame()
+                           ->loader()
+                           .documentLoader()
+                           ->historyItem());
   EXPECT_LT(frameView->frameRect().size().width(), 1000);
   EXPECT_SIZE_EQ(ScrollOffset(0, 1000), firstItem->getScrollOffset());
 }
 
 // Test that the coordinates sent into moveRangeSelection are offset by the
 // visual viewport's location.
 TEST_P(VisualViewportTest,
        DISABLED_TestWebFrameRangeAccountsForVisualViewportScroll) {
   initializeWithDesktopSettings();
   webViewImpl()->settings()->setDefaultFontSize(12);
@@ skipping 1430 matching lines @@
                                    "  body {"
                                    "    margin: 0px;"
                                    "  }"
                                    "  div { height:110vh; width: 110vw; }"
                                    "</style>"
                                    "<div></div>",
                                    baseURL);
 }
 
 }  // namespace