Split the frame tree logic out of HistoryItem

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 711 matching lines @@
     webViewImpl->resize(WebSize(640, 480));
     webViewImpl->layout();
     EXPECT_EQ(0, webViewImpl->mainFrame()->scrollOffset().width);
     EXPECT_EQ(0, webViewImpl->mainFrame()->scrollOffset().height);
 
     // Make the page scale and scroll with the given paremeters.
     webViewImpl->setPageScaleFactor(2.0f, WebPoint(116, 84));
     EXPECT_EQ(2.0f, webViewImpl->pageScaleFactor());
     EXPECT_EQ(116, webViewImpl->mainFrame()->scrollOffset().width);
     EXPECT_EQ(84, webViewImpl->mainFrame()->scrollOffset().height);
-    webViewImpl->page()->mainFrame()->loader().history()->saveDocumentAndScrollState();
+    webViewImpl->page()->history()->saveDocumentAndScrollState(webViewImpl->page()->mainFrame());
 
     // Confirm that restoring the page state restores the parameters.
     webViewImpl->setPageScaleFactor(1.5f, WebPoint(16, 24));
     EXPECT_EQ(1.5f, webViewImpl->pageScaleFactor());
     EXPECT_EQ(16, webViewImpl->mainFrame()->scrollOffset().width);
     EXPECT_EQ(24, webViewImpl->mainFrame()->scrollOffset().height);
     // WebViewImpl::setPageScaleFactor is performing user scrolls, which will set the
     // wasScrolledByUser flag on the main frame, and prevent restoreScrollPositionAndViewState
     // from restoring the scrolling position.
     webViewImpl->page()->mainFrame()->view()->setWasScrolledByUser(false);
-    webViewImpl->page()->mainFrame()->loader().history()->restoreScrollPositionAndViewState();
+    webViewImpl->page()->history()->restoreScrollPositionAndViewState(webViewImpl->page()->mainFrame());
     EXPECT_EQ(2.0f, webViewImpl->pageScaleFactor());
     EXPECT_EQ(116, webViewImpl->mainFrame()->scrollOffset().width);
     EXPECT_EQ(84, webViewImpl->mainFrame()->scrollOffset().height);
-    webViewImpl->page()->mainFrame()->loader().history()->saveDocumentAndScrollState();
+    webViewImpl->page()->history()->saveDocumentAndScrollState(webViewImpl->page()->mainFrame());
 
     // Confirm that resetting the page state resets the saved scroll position.
     // The HistoryController treats a page scale factor of 0.0f as special and avoids
     // restoring it to the WebView.
     webViewImpl->resetScrollAndScaleState();
     EXPECT_EQ(1.0f, webViewImpl->pageScaleFactor());
     EXPECT_EQ(0, webViewImpl->mainFrame()->scrollOffset().width);
     EXPECT_EQ(0, webViewImpl->mainFrame()->scrollOffset().height);
-    webViewImpl->page()->mainFrame()->loader().history()->restoreScrollPositionAndViewState();
+    webViewImpl->page()->history()->restoreScrollPositionAndViewState(webViewImpl->page()->mainFrame());
     EXPECT_EQ(1.0f, webViewImpl->pageScaleFactor());
     EXPECT_EQ(0, webViewImpl->mainFrame()->scrollOffset().width);
     EXPECT_EQ(0, webViewImpl->mainFrame()->scrollOffset().height);
 }
 
 class EnterFullscreenWebViewClient : public WebViewClient {
 public:
     // WebViewClient methods
     virtual bool enterFullScreen() { return true; }
     virtual void exitFullScreen() { }
@@ skipping 464 matching lines @@
 
     webView->setFocus(true);
     webView->setFocus(false);
     webView->setFocus(true);
 
     WebElement element = webView->mainFrame()->document().getElementById("message");
     EXPECT_STREQ("DOMFocusOutDOMFocusIn", element.innerText().utf8().data());
 }
 
 }