diff options
| -rw-r--r-- | Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp | 7 | ||||
| -rw-r--r-- | Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp index 8d75dfc..99f34d5 100644 --- a/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp +++ b/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp @@ -287,12 +287,13 @@ void FrameLoaderClientAndroid::dispatchDidStartProvisionalLoad() { notImplemented(); } -void FrameLoaderClientAndroid::dispatchDidReceiveTitle(const String& title) { +void FrameLoaderClientAndroid::dispatchDidReceiveTitle(const StringWithDirection& title) { ASSERT(m_frame); // Used to check for FrameLoadTypeStandard but we only want to send the title for // the top frame and not sub-frames. + // FIXME: Use direction of title. if (!m_frame->tree() || !m_frame->tree()->parent()) { - m_webFrame->setTitle(title); + m_webFrame->setTitle(title.string()); } } @@ -883,7 +884,7 @@ PassRefPtr<DocumentLoader> FrameLoaderClientAndroid::createDocumentLoader( return loader.release(); } -void FrameLoaderClientAndroid::setTitle(const String& title, const KURL& url) { +void FrameLoaderClientAndroid::setTitle(const StringWithDirection& title, const KURL& url) { // Not needed. dispatchDidReceiveTitle is called immediately after this. // url is used to update the Apple port history items. verifiedOk(); 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 |