Merge Webkit at r70949: Added new FrameLoaderClient stubs

http://trac.webkit.org/changeset/70333
http://trac.webkit.org/changeset/70574
http://trac.webkit.org/changeset/70894

Change-Id: I9a212f4ab07c0599ebb8dbd10201f5ca0fa71f69

4 files changed, 16 insertions, 4 deletions

diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
index 2688d69..172a8c9 100644
--- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
@@ -143,7 +143,7 @@ void ChromeClientAndroid::takeFocus(FocusDirection) { notImplemented(); }
 void ChromeClientAndroid::focusedNodeChanged(Node*) { notImplemented(); }
 
 Page* ChromeClientAndroid::createWindow(Frame* frame, const FrameLoadRequest&,
-        const WindowFeatures& features)
+        const WindowFeatures& features, const NavigationAction&)
 {
     ASSERT(frame);
 #ifdef ANDROID_MULTIPLE_WINDOWS
diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.h b/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
index b7d423d..f5d8782 100644
--- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
+++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
@@ -75,7 +75,7 @@ namespace android {
         // Frame wants to create the new Page.  Also, the newly created window
         // should not be shown to the user until the ChromeClient of the newly
         // created Page has its show method called.
-        virtual Page* createWindow(Frame*, const FrameLoadRequest&, const WindowFeatures&);
+        virtual Page* createWindow(Frame*, const FrameLoadRequest&, const WindowFeatures&, const NavigationAction&);
         virtual void show();
         
         virtual bool canRunModal();
diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
index 1903f2e..d622719 100644
--- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
@@ -411,7 +411,7 @@ void FrameLoaderClientAndroid::dispatchDidFirstVisuallyNonEmptyLayout()
     notImplemented();
 }
 
-Frame* FrameLoaderClientAndroid::dispatchCreatePage() {
+Frame* FrameLoaderClientAndroid::dispatchCreatePage(const NavigationAction&) {
     ASSERT(m_frame);
 #ifdef ANDROID_MULTIPLE_WINDOWS
     if (m_frame->settings() && m_frame->settings()->supportMultipleWindows())
@@ -926,6 +926,10 @@ void FrameLoaderClientAndroid::transitionToCommittedForNewPage() {
     m_webFrame->transitionToCommitted(m_frame);
 }
 
+void FrameLoaderClientAndroid::dispatchDidBecomeFrameset(bool)
+{
+}
+
 bool FrameLoaderClientAndroid::canCachePage() const {
     return true;
 }
@@ -1244,6 +1248,11 @@ void FrameLoaderClientAndroid::didTransferChildFrameToNewDocument(WebCore::Page*
     }
 }
 
+void FrameLoaderClientAndroid::transferLoadingResourceFromPage(unsigned long, DocumentLoader*, const ResourceRequest&, Page*)
+{
+    notImplemented();
+}
+
 // This function is used by the <OBJECT> element to determine the type of
 // the contents and work out if it can render it.
 ObjectContentType FrameLoaderClientAndroid::objectContentType(const KURL& url,
diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h
index b40f645..125b2fa 100644
--- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h
+++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h
@@ -97,7 +97,7 @@ namespace android {
         virtual void dispatchDidFirstLayout();
         virtual void dispatchDidFirstVisuallyNonEmptyLayout();
 
-        virtual Frame* dispatchCreatePage();
+        virtual Frame* dispatchCreatePage(const NavigationAction&);
         virtual void dispatchShow();
 
         virtual void dispatchDecidePolicyForMIMEType(FramePolicyFunction, const String& MIMEType, const ResourceRequest&);
@@ -174,11 +174,14 @@ namespace android {
         virtual void transitionToCommittedFromCachedFrame(WebCore::CachedFrame*);
         virtual void transitionToCommittedForNewPage();
 
+        virtual void dispatchDidBecomeFrameset(bool isFrameSet);
+
         virtual bool canCachePage() const;
         virtual void download(ResourceHandle*, const ResourceRequest&, const ResourceRequest&, const ResourceResponse&);
 
         virtual WTF::PassRefPtr<Frame> createFrame(const KURL& url, const String& name, HTMLFrameOwnerElement* ownerElement, const String& referrer, bool allowsScrolling, int marginWidth, int marginHeight);
         virtual void didTransferChildFrameToNewDocument(WebCore::Page*);
+        virtual void transferLoadingResourceFromPage(unsigned long identifier, DocumentLoader*, const ResourceRequest&, Page* oldPage);
         virtual WTF::PassRefPtr<Widget> createPlugin(const IntSize&, HTMLPlugInElement*, const KURL&, const WTF::Vector<String>&, const WTF::Vector<String>&, const String&, bool loadManually);
         virtual void redirectDataToPlugin(Widget* pluginWidget);