Move HistoryItem handling to DocumentLoader

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

 /*
  * Copyright (C) 2010 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 2395 matching lines @@
 
   FrameTestHelpers::WebViewHelper webViewHelper;
   webViewHelper.initializeAndLoad(m_baseURL + "fixed_layout.html", true,
                                   nullptr, &client, nullptr,
                                   enableViewportSettings);
   webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
 
   webViewHelper.webView()->setPageScaleFactor(3);
   EXPECT_EQ(3, toLocalFrame(webViewHelper.webView()->page()->mainFrame())
                    ->loader()
-                   .currentItem()
+                   .documentLoader()
+                   ->historyItem()
                    ->pageScaleFactor());
 }
 
 TEST_P(ParameterizedWebFrameTest, initialScaleWrittenToHistoryItem) {
   registerMockedHttpURLLoad("fixed_layout.html");
 
   FixedLayoutTestWebViewClient client;
   client.m_screenInfo.deviceScaleFactor = 1;
   int viewportWidth = 640;
   int viewportHeight = 480;
 
   FrameTestHelpers::WebViewHelper webViewHelper;
   webViewHelper.initialize(true, nullptr, &client, nullptr,
                            enableViewportSettings);
   webViewHelper.webView()->setDefaultPageScaleLimits(0.25f, 5);
   FrameTestHelpers::loadFrame(webViewHelper.webView()->mainFrame(),
                               m_baseURL + "fixed_layout.html");
   webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
 
   int defaultFixedLayoutWidth = 980;
   float minimumPageScaleFactor = viewportWidth / (float)defaultFixedLayoutWidth;
   EXPECT_EQ(minimumPageScaleFactor,
             toLocalFrame(webViewHelper.webView()->page()->mainFrame())
                 ->loader()
-                .currentItem()
+                .documentLoader()
+                ->historyItem()
                 ->pageScaleFactor());
 }
 
 TEST_P(ParameterizedWebFrameTest, pageScaleFactorDoesntShrinkFrameView) {
   registerMockedHttpURLLoad("large-div.html");
 
   FixedLayoutTestWebViewClient client;
   client.m_screenInfo.deviceScaleFactor = 1;
   // Small viewport to ensure there are always scrollbars.
   int viewportWidth = 64;
@@ skipping 4576 matching lines @@
 }
 
 TEST_P(ParameterizedWebFrameTest, BackToReload) {
   registerMockedHttpURLLoad("fragment_middle_click.html");
   FrameTestHelpers::WebViewHelper webViewHelper;
   webViewHelper.initializeAndLoad(m_baseURL + "fragment_middle_click.html",
                                   true);
   WebFrame* frame = webViewHelper.webView()->mainFrame();
   const FrameLoader& mainFrameLoader =
       webViewHelper.webView()->mainFrameImpl()->frame()->loader();
-  Persistent<HistoryItem> firstItem = mainFrameLoader.currentItem();
+  Persistent<HistoryItem> firstItem =
+      mainFrameLoader.documentLoader()->historyItem();
   EXPECT_TRUE(firstItem);
 
   registerMockedHttpURLLoad("white-1x1.png");
   FrameTestHelpers::loadFrame(frame, m_baseURL + "white-1x1.png");
-  EXPECT_NE(firstItem.get(), mainFrameLoader.currentItem());
+  EXPECT_NE(firstItem.get(), mainFrameLoader.documentLoader()->historyItem());
 
   FrameTestHelpers::loadHistoryItem(frame, WebHistoryItem(firstItem.get()),
                                     WebHistoryDifferentDocumentLoad,
                                     WebCachePolicy::UseProtocolCachePolicy);
-  EXPECT_EQ(firstItem.get(), mainFrameLoader.currentItem());
+  EXPECT_EQ(firstItem.get(), mainFrameLoader.documentLoader()->historyItem());
 
   FrameTestHelpers::reloadFrame(frame);
   EXPECT_EQ(WebCachePolicy::ValidatingCacheData,
             frame->dataSource()->getRequest().getCachePolicy());
 }
 
 TEST_P(ParameterizedWebFrameTest, BackDuringChildFrameReload) {
   registerMockedHttpURLLoad("page_with_blank_iframe.html");
   FrameTestHelpers::WebViewHelper webViewHelper;
   webViewHelper.initializeAndLoad(m_baseURL + "page_with_blank_iframe.html",
@@ skipping 13 matching lines @@
   WebHistoryItem item;
   item.initialize();
   WebURL historyURL(toKURL(m_baseURL + "white-1x1.png"));
   item.setURLString(historyURL.string());
   WebURLRequest request = mainFrame->requestFromHistoryItem(
       item, WebCachePolicy::UseProtocolCachePolicy);
   mainFrame->load(request, WebFrameLoadType::BackForward, item);
 
   FrameTestHelpers::reloadFrame(childFrame);
   EXPECT_EQ(item.urlString(), mainFrame->document().url().string());
-  EXPECT_EQ(item.urlString(),
-            WebString(mainFrameLoader.currentItem()->urlString()));
+  EXPECT_EQ(
+      item.urlString(),
+      WebString(mainFrameLoader.documentLoader()->historyItem()->urlString()));
 }
 
 TEST_P(ParameterizedWebFrameTest, ReloadPost) {
   registerMockedHttpURLLoad("reload_post.html");
   FrameTestHelpers::WebViewHelper webViewHelper;
   webViewHelper.initializeAndLoad(m_baseURL + "reload_post.html", true);
   WebFrame* frame = webViewHelper.webView()->mainFrame();
 
   FrameTestHelpers::loadFrame(webViewHelper.webView()->mainFrame(),
                               "javascript:document.forms[0].submit()");
@@ skipping 12 matching lines @@
 }
 
 TEST_P(ParameterizedWebFrameTest, LoadHistoryItemReload) {
   registerMockedHttpURLLoad("fragment_middle_click.html");
   FrameTestHelpers::WebViewHelper webViewHelper;
   webViewHelper.initializeAndLoad(m_baseURL + "fragment_middle_click.html",
                                   true);
   WebFrame* frame = webViewHelper.webView()->mainFrame();
   const FrameLoader& mainFrameLoader =
       webViewHelper.webView()->mainFrameImpl()->frame()->loader();
-  Persistent<HistoryItem> firstItem = mainFrameLoader.currentItem();
+  Persistent<HistoryItem> firstItem =
+      mainFrameLoader.documentLoader()->historyItem();
   EXPECT_TRUE(firstItem);
 
   registerMockedHttpURLLoad("white-1x1.png");
   FrameTestHelpers::loadFrame(frame, m_baseURL + "white-1x1.png");
-  EXPECT_NE(firstItem.get(), mainFrameLoader.currentItem());
+  EXPECT_NE(firstItem.get(), mainFrameLoader.documentLoader()->historyItem());
 
   // Cache policy overrides should take.
   FrameTestHelpers::loadHistoryItem(frame, WebHistoryItem(firstItem),
                                     WebHistoryDifferentDocumentLoad,
                                     WebCachePolicy::ValidatingCacheData);
-  EXPECT_EQ(firstItem.get(), mainFrameLoader.currentItem());
+  EXPECT_EQ(firstItem.get(), mainFrameLoader.documentLoader()->historyItem());
   EXPECT_EQ(WebCachePolicy::ValidatingCacheData,
             frame->dataSource()->getRequest().getCachePolicy());
 }
 
 class TestCachePolicyWebFrameClient
     : public FrameTestHelpers::TestWebFrameClient {
  public:
   explicit TestCachePolicyWebFrameClient(
       TestCachePolicyWebFrameClient* parentClient)
       : m_parentClient(parentClient),
@@ skipping 257 matching lines @@
  private:
   WebHistoryCommitType m_lastCommitType;
 };
 
 TEST_P(ParameterizedWebFrameTest, SameDocumentHistoryNavigationCommitType) {
   registerMockedHttpURLLoad("push_state.html");
   TestDidNavigateCommitTypeWebFrameClient client;
   FrameTestHelpers::WebViewHelper webViewHelper;
   WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(
       m_baseURL + "push_state.html", true, &client);
-  Persistent<HistoryItem> item =
-      toLocalFrame(webViewImpl->page()->mainFrame())->loader().currentItem();
+  Persistent<HistoryItem> item = toLocalFrame(webViewImpl->page()->mainFrame())
+                                     ->loader()
+                                     .documentLoader()
+                                     ->historyItem();
   runPendingTasks();
 
   toLocalFrame(webViewImpl->page()->mainFrame())
       ->loader()
-      .load(
-          FrameLoadRequest(
-              nullptr, FrameLoader::resourceRequestFromHistoryItem(
-                           item.get(), WebCachePolicy::UseProtocolCachePolicy)),
-          FrameLoadTypeBackForward, item.get(), HistorySameDocumentLoad);
+      .load(FrameLoadRequest(nullptr,
+                             item->generateResourceRequest(
+                                 WebCachePolicy::UseProtocolCachePolicy)),
+            FrameLoadTypeBackForward, item.get(), HistorySameDocumentLoad);
   EXPECT_EQ(WebBackForwardCommit, client.lastCommitType());
 }
 
 class TestHistoryWebFrameClient : public FrameTestHelpers::TestWebFrameClient {
  public:
   TestHistoryWebFrameClient() {
     m_replacesCurrentHistoryItem = false;
   }
 
   void didStartProvisionalLoad(WebDataSource* dataSource,
@@ skipping 105 matching lines @@
 
   FrameTestHelpers::WebViewHelper webViewHelper;
   webViewHelper.initialize();
   WebFrame* frame = webViewHelper.webView()->mainFrame();
   const FrameLoader& mainFrameLoader =
       webViewHelper.webView()->mainFrameImpl()->frame()->loader();
   WebURLRequest request(toKURL(url));
   frame->loadRequest(request);
 
   // Before commit, there is no history item.
-  EXPECT_FALSE(mainFrameLoader.currentItem());
+  EXPECT_FALSE(mainFrameLoader.documentLoader()->historyItem());
 
   FrameTestHelpers::pumpPendingRequestsForFrameToLoad(frame);
 
   // After commit, there is.
-  HistoryItem* item = mainFrameLoader.currentItem();
+  HistoryItem* item = mainFrameLoader.documentLoader()->historyItem();
   ASSERT_TRUE(item);
   EXPECT_EQ(WTF::String(url.data()), item->urlString());
 }
 
 class FailCreateChildFrame : public FrameTestHelpers::TestWebFrameClient {
  public:
   FailCreateChildFrame() : m_callCount(0) {}
 
   WebLocalFrame* createChildFrame(
       WebLocalFrame* parent,
@@ skipping 4002 matching lines @@
   EXPECT_FALSE(testSelectAll("<textarea></textarea>"));
   EXPECT_TRUE(testSelectAll("<textarea>nonempty</textarea>"));
   EXPECT_FALSE(testSelectAll("<input>"));
   EXPECT_TRUE(testSelectAll("<input value='nonempty'>"));
   // TODO(amaralp): Empty contenteditable should not have select all enabled.
   EXPECT_TRUE(testSelectAll("<div contenteditable></div>"));
   EXPECT_TRUE(testSelectAll("<div contenteditable>nonempty</div>"));
 }
 
 }  // namespace blink