diff options
| author | Steve Block <steveblock@google.com> | 2010-04-29 02:02:09 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-04-29 02:02:09 -0700 |
| commit | fbcad591f3f2962b92aa61c017c360ddaef5ebba (patch) | |
| tree | a1e6f4d2b649801f5455f51739d75f4f34a7d190 /WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h | |
| parent | 5a0626b52e267a829822dd9fc9f2863ebc3259c0 (diff) | |
| parent | ec79cd2f7baa7ba941c8343f6d79f0dbfdd5be2a (diff) | |
| download | external_webkit-fbcad591f3f2962b92aa61c017c360ddaef5ebba.zip external_webkit-fbcad591f3f2962b92aa61c017c360ddaef5ebba.tar.gz external_webkit-fbcad591f3f2962b92aa61c017c360ddaef5ebba.tar.bz2 | |
Merge changes Ie9ba4c69,I35363367,I18aaae5f,I2c315360,I4f163c97,Ib640e64c,I98a4af82
* changes:
Merge webkit.org at r55033 : Update WebKit revision
Merge webkit.org at r55033 : Update Android-specific LayoutTest expected result
Merge webkit.org at r55033 : Implement FrameLoaderClient::didTransferChildFrameToNewDocument for Android
Merge webkit.org at r55033 : Implement PluginPackage::NPVersion for Android
Merge webkit.org at r55033 : Implement new ChromeClient::iconForFiles method for Android
Merge webkit.org at r55033 : Fix merge conflicts
Merge webkit.org at r55033 : Initial merge by git
Diffstat (limited to 'WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h')
| -rw-r--r-- | WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h index 3b754b8..fe58124 100644 --- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h +++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h @@ -176,11 +176,9 @@ namespace android { 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 WTF::PassRefPtr<Widget> createPlugin(const IntSize&, HTMLPlugInElement*, const KURL&, - const WTF::Vector<String>&, const WTF::Vector<String>&, - const String&, bool loadManually); + 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 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); virtual WTF::PassRefPtr<Widget> createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const KURL& baseURL, const WTF::Vector<String>& paramNames, const WTF::Vector<String>& paramValues); |