diff options
Diffstat (limited to 'WebCore/loader/EmptyClients.h')
| -rw-r--r-- | WebCore/loader/EmptyClients.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/WebCore/loader/EmptyClients.h b/WebCore/loader/EmptyClients.h index c6ae799..e4b9af5 100644 --- a/WebCore/loader/EmptyClients.h +++ b/WebCore/loader/EmptyClients.h @@ -288,13 +288,8 @@ public: virtual void updateGlobalHistory() { } virtual void updateGlobalHistoryRedirectLinks() { } virtual bool shouldGoToHistoryItem(HistoryItem*) const { return false; } -<<<<<<< HEAD:WebCore/loader/EmptyClients.h - virtual void dispatchDidAddBackForwardItem(HistoryItem*) const { } - virtual void dispatchDidRemoveBackForwardItem(HistoryItem*) const { } -======= virtual void dispatchDidAddBackForwardItem(HistoryItem*) const { } virtual void dispatchDidRemoveBackForwardItem(HistoryItem*) const { }; ->>>>>>> webkit.org at r51976:WebCore/loader/EmptyClients.h virtual void dispatchDidChangeBackForwardIndex() const { } virtual void saveViewStateToItem(HistoryItem*) { } virtual bool canCachePage() const { return false; } |