diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-10-05 21:26:05 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-10-07 11:03:34 +0100 |
| commit | 8f53f0666f20844fa87c63e5f823470c12fc2721 (patch) | |
| tree | c970259142b0c635f812c7ac216065816a9fef24 /WebKit | |
| parent | a485c90712dfe99674e708d289ca14c6623a41f7 (diff) | |
| download | external_webkit-8f53f0666f20844fa87c63e5f823470c12fc2721.zip external_webkit-8f53f0666f20844fa87c63e5f823470c12fc2721.tar.gz external_webkit-8f53f0666f20844fa87c63e5f823470c12fc2721.tar.bz2 | |
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
Diffstat (limited to 'WebKit')
| -rw-r--r-- | WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp | 2 | ||||
| -rw-r--r-- | WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h | 2 |
2 files changed, 2 insertions, 2 deletions
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); |