diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebCore/loader/HistoryController.h | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebCore/loader/HistoryController.h')
| -rw-r--r-- | Source/WebCore/loader/HistoryController.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/WebCore/loader/HistoryController.h b/Source/WebCore/loader/HistoryController.h index 9514d2f..59f11a2 100644 --- a/Source/WebCore/loader/HistoryController.h +++ b/Source/WebCore/loader/HistoryController.h @@ -60,8 +60,6 @@ public: void invalidateCurrentItemCachedPage(); - void goToItem(HistoryItem*, FrameLoadType); - void updateForBackForwardNavigation(); void updateForReload(); void updateForStandardLoad(HistoryUpdateType updateType = UpdateAll); @@ -85,6 +83,10 @@ public: 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); |