diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-06-28 16:42:48 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-07-02 10:29:56 +0100 |
| commit | 06ea8e899e48f1f2f396b70e63fae369f2f23232 (patch) | |
| tree | 20c1428cd05c76f32394ab354ea35ed99acd86d8 /WebCore/loader/HistoryController.h | |
| parent | 72aad67af14193199e29cdd5c4ddc095a8b9a8a8 (diff) | |
| download | external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.zip external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.gz external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.bz2 | |
Merge WebKit at r61871: Initial merge by git.
Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
Diffstat (limited to 'WebCore/loader/HistoryController.h')
| -rw-r--r-- | WebCore/loader/HistoryController.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/WebCore/loader/HistoryController.h b/WebCore/loader/HistoryController.h index 64f7854..19902f8 100644 --- a/WebCore/loader/HistoryController.h +++ b/WebCore/loader/HistoryController.h @@ -43,6 +43,8 @@ class SerializedScriptValue; class HistoryController : public Noncopyable { public: + enum HistoryUpdateType { UpdateAll, UpdateAllExceptBackForwardList }; + HistoryController(Frame*); ~HistoryController(); @@ -58,11 +60,10 @@ public: void invalidateCurrentItemCachedPage(); void goToItem(HistoryItem*, FrameLoadType); - bool urlsMatchItem(HistoryItem*) const; void updateForBackForwardNavigation(); void updateForReload(); - void updateForStandardLoad(); + void updateForStandardLoad(HistoryUpdateType updateType = UpdateAll); void updateForRedirectWithLockedBackForwardList(); void updateForClientRedirect(); void updateForCommit(); |