diff options
| author | Steve Block <steveblock@google.com> | 2009-12-15 11:15:20 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-12-17 17:41:10 +0000 |
| commit | aad6f24e036b3740071bb995b955b18b572067b2 (patch) | |
| tree | 01f4412526c81ec62e02d71d128ec45827a12fdc /WebCore/loader/EmptyClients.h | |
| parent | dc11ae82374cba25ed19c3e57537cbc667f8efe2 (diff) | |
| download | external_webkit-aad6f24e036b3740071bb995b955b18b572067b2.zip external_webkit-aad6f24e036b3740071bb995b955b18b572067b2.tar.gz external_webkit-aad6f24e036b3740071bb995b955b18b572067b2.tar.bz2 | |
Merge webkit.org at r51976 : Fix general conflicts.
Notes ...
For FrameLoader.cpp/h, see http://trac.webkit.org/changeset/51644
For FrameView.cpp and ScrolView.cpp, see http://trac.webkit.org/changeset/51636
For PluginInfoStore.cpp, see http://trac.webkit.org/changeset/51257
For Geolocation.cpp, see http://trac.webkit.org/changeset/50605
For V8DOMWrapper.cpp, see http://trac.webkit.org/changeset/51004
For V8Proxy.cpp, see http://trac.webkit.org/changeset/50441, http://trac.webkit.org/changeset/50327, http://trac.webkit.org/changeset/50406 and http://trac.webkit.org/changeset/50523
For HTMLInputElement.cpp, see http://trac.webkit.org/changeset/50996
For RenderBlock.cpp/RenderInline.cpp, see https://android-git.corp.google.com/g/#change,33465
Android-specific change to now-deleted JSCanvasArrayCustom.cpp was trivial.
Change-Id: Iddc8d43bdcb6208d6a991a7a1d591e8a4f918bf7
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; } |