diff options
| author | Iain Merrick <husky@google.com> | 2010-09-13 17:24:46 +0100 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-09-16 12:10:44 +0100 |
| commit | 5ff0cae98f72d38d027120bffdeaa3fe3b5afd57 (patch) | |
| tree | 6f4ead5e0a97cdd2cfb21a74b2f13d19b77981f6 /WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h | |
| parent | f3dcd63b78bb179134cb7f0a4c9ec20b71242f9d (diff) | |
| download | external_webkit-5ff0cae98f72d38d027120bffdeaa3fe3b5afd57.zip external_webkit-5ff0cae98f72d38d027120bffdeaa3fe3b5afd57.tar.gz external_webkit-5ff0cae98f72d38d027120bffdeaa3fe3b5afd57.tar.bz2 | |
Merge WebKit at r67178 : Add FrameNetworkingContextAndroid.
This is needed to implement a new callback in FrameLoaderClient
which was added in http://trac.webkit.org/changeset/66794
Implementation copied from chromium's FrameNetworkingContextImpl.
(We can't just call FrameNetworkingContext's constructor directly
because it's protected.)
Change-Id: I10a318daed219a1b05972052aaea286c719b4b3c
Diffstat (limited to 'WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h')
| -rw-r--r-- | WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h index ce711a0..645fcf3 100644 --- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h +++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h @@ -202,6 +202,8 @@ namespace android { virtual void dispatchDidReceiveTouchIconURL(const String& url, bool precomposed); + virtual PassRefPtr<FrameNetworkingContext> createNetworkingContext(); + // WebIconDatabaseClient api virtual void didAddIconForPageUrl(const String& pageUrl); |