diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-05 14:36:32 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-10 15:38:30 +0100 |
| commit | f05b935882198ccf7d81675736e3aeb089c5113a (patch) | |
| tree | 4ea0ca838d9ef1b15cf17ddb3928efb427c7e5a1 /WebCore/loader/HistoryController.h | |
| parent | 60fbdcc62bced8db2cb1fd233cc4d1e4ea17db1b (diff) | |
| download | external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.zip external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.tar.gz external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.tar.bz2 | |
Merge WebKit at r74534: Initial merge by git.
Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
Diffstat (limited to 'WebCore/loader/HistoryController.h')
| -rw-r--r-- | WebCore/loader/HistoryController.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/WebCore/loader/HistoryController.h b/WebCore/loader/HistoryController.h index 01f093c..1bf5072 100644 --- a/WebCore/loader/HistoryController.h +++ b/WebCore/loader/HistoryController.h @@ -84,14 +84,12 @@ public: void replaceState(PassRefPtr<SerializedScriptValue>, const String& title, const String& url); private: - void initializeItem(HistoryItem*); - PassRefPtr<HistoryItem> createItem(); + PassRefPtr<HistoryItem> createItem(bool useOriginal); PassRefPtr<HistoryItem> createItemTree(Frame* targetFrame, bool clipAtTarget); void recursiveGoToItem(HistoryItem*, HistoryItem*, FrameLoadType); bool currentFramesMatchItem(HistoryItem*) const; void updateBackForwardListClippedAtTarget(bool doClip); - void updateCurrentItem(); Frame* m_frame; |