From 8f53f0666f20844fa87c63e5f823470c12fc2721 Mon Sep 17 00:00:00 2001
From: Kristian Monsen <kristianm@google.com>
Date: Tue, 5 Oct 2010 21:26:05 +0100
Subject: Merge WebKit at r68651 : Added WebCore::Page* parameter to
 didTransferChildFrameToNewDocument

Introduced in webkit CL:
http://trac.webkit.org/changeset/68576

Most platforms do not use the parameter in the first implementation.

Change-Id: I704b45af56bee85f277b737412549abcfeb90b08
---
 WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp | 2 +-
 WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'WebKit')

diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
index b756dc3..3268677 100644
--- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
@@ -1233,7 +1233,7 @@ WTF::PassRefPtr<Widget> FrameLoaderClientAndroid::createJavaAppletWidget(const I
     return 0;
 }
 
-void FrameLoaderClientAndroid::didTransferChildFrameToNewDocument()
+void FrameLoaderClientAndroid::didTransferChildFrameToNewDocument(WebCore::Page*)
 {
     ASSERT(m_frame);
     // m_webFrame points to the WebFrame for the page that our frame previously
diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h
index 8677d35..eb0c26e 100644
--- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h
+++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h
@@ -179,7 +179,7 @@ namespace android {
         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();
+        virtual void didTransferChildFrameToNewDocument(WebCore::Page*);
         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);
 
-- 
cgit v1.1