diff options
| author | Ben Murdoch <benm@google.com> | 2011-06-07 11:26:09 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-10 14:57:13 +0100 |
| commit | d0432c2bc211a5607471b057aafc7538a33034f6 (patch) | |
| tree | 85bd7529858212ccc038e3eb87d85028a1d6b3e9 /Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h | |
| parent | 829e967a377c20562f78476d819aa35a53302435 (diff) | |
| download | external_webkit-d0432c2bc211a5607471b057aafc7538a33034f6.zip external_webkit-d0432c2bc211a5607471b057aafc7538a33034f6.tar.gz external_webkit-d0432c2bc211a5607471b057aafc7538a33034f6.tar.bz2 | |
Merge WebKit at r84325: Fix FrameLoaderClient.
Update signatures for dispatchDidReceiveTitle and setTitle with
new parameter.
See http://trac.webkit.org/changeset/82580
Change-Id: I2a74302b7f43d70103680752fba1e80b5272fb7f
Diffstat (limited to 'Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h')
| -rw-r--r-- | Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h b/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h index 62ec9e0..e325e01 100644 --- a/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h +++ b/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h @@ -88,7 +88,7 @@ namespace android { virtual void dispatchWillClose(); virtual void dispatchDidReceiveIcon(); virtual void dispatchDidStartProvisionalLoad(); - virtual void dispatchDidReceiveTitle(const String& title); + virtual void dispatchDidReceiveTitle(const StringWithDirection& title); virtual void dispatchDidCommitLoad(); virtual void dispatchDidFailProvisionalLoad(const ResourceError&); virtual void dispatchDidFailLoad(const ResourceError&); @@ -167,7 +167,7 @@ namespace android { virtual void prepareForDataSourceReplacement(); virtual PassRefPtr<DocumentLoader> createDocumentLoader(const ResourceRequest&, const SubstituteData&); - virtual void setTitle(const String& title, const KURL&); + virtual void setTitle(const StringWithDirection& title, const KURL&); // This provides the userAgent to WebCore. It is used by WebCore to // populate navigator.userAgent and to set the HTTP header in |