From aad6f24e036b3740071bb995b955b18b572067b2 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Tue, 15 Dec 2009 11:15:20 +0000 Subject: 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 --- WebCore/loader/FrameLoader.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'WebCore/loader/FrameLoader.h') diff --git a/WebCore/loader/FrameLoader.h b/WebCore/loader/FrameLoader.h index 875736f..03a1175 100644 --- a/WebCore/loader/FrameLoader.h +++ b/WebCore/loader/FrameLoader.h @@ -439,7 +439,12 @@ private: Frame* loadSubframe(HTMLFrameOwnerElement*, const KURL&, const String& name, const String& referrer); +#if PLATFORM(ANDROID) + // TODO: Upstream to webkit.org + void loadInSameDocument(const KURL&, SerializedScriptValue* stateObject, bool isNewNavigation, bool suppressAddToHistory); +#else void loadInSameDocument(const KURL&, SerializedScriptValue* stateObject, bool isNewNavigation); +#endif void provisionalLoadStarted(); -- cgit v1.1