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/android/WebCoreSupport/FrameLoaderClientAndroid.cpp | |
| 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/android/WebCoreSupport/FrameLoaderClientAndroid.cpp')
| -rw-r--r-- | WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp | 2 |
1 files changed, 1 insertions, 1 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 |