Merge 79107 - 2011-02-19 Charlie Reis <creis@chromium.org>...

Source/WebCore/loader/HistoryController.h

Index: Source/WebCore/loader/HistoryController.h
===================================================================
--- Source/WebCore/loader/HistoryController.h	(revision 79367)
+++ Source/WebCore/loader/HistoryController.h	(working copy)
@@ -60,8 +60,6 @@
 
     void invalidateCurrentItemCachedPage();
 
-    void goToItem(HistoryItem*, FrameLoadType);
-
     void updateForBackForwardNavigation();
     void updateForReload();
     void updateForStandardLoad(HistoryUpdateType updateType = UpdateAll);
@@ -85,6 +83,10 @@
     void replaceState(PassRefPtr<SerializedScriptValue>, const String& title, const String& url);
 
 private:
+    friend class Page;
+    bool shouldStopLoadingForHistoryItem(HistoryItem*) const;
+    void goToItem(HistoryItem*, FrameLoadType);
+
     void initializeItem(HistoryItem*);
     PassRefPtr<HistoryItem> createItem();
     PassRefPtr<HistoryItem> createItemTree(Frame* targetFrame, bool clipAtTarget);