diff options
Diffstat (limited to 'Source/WebKit/efl/WebCoreSupport')
-rw-r--r-- | Source/WebKit/efl/WebCoreSupport/EditorClientEfl.h | 2 | ||||
-rw-r--r-- | Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp | 9 | ||||
-rw-r--r-- | Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h | 6 |
3 files changed, 9 insertions, 8 deletions
diff --git a/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.h b/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.h index 575a50d..56b3300 100644 --- a/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.h +++ b/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.h @@ -114,7 +114,7 @@ public: virtual void getGuessesForWord(const String& word, const String& context, WTF::Vector<String>& guesses); virtual void willSetInputMethodState(); virtual void setInputMethodState(bool enabled); - virtual void requestCheckingOfString(WebCore::SpellChecker*, int, const WTF::String&) {} + virtual void requestCheckingOfString(WebCore::SpellChecker*, int, WebCore::TextCheckingTypeMask, const WTF::String&) {} virtual TextCheckerClient* textChecker() { return this; } private: diff --git a/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp b/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp index fa34ac9..9a409f2 100644 --- a/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp +++ b/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp @@ -576,9 +576,10 @@ void FrameLoaderClientEfl::dispatchDidStartProvisionalLoad() ewk_view_load_provisional(m_view); } -void FrameLoaderClientEfl::dispatchDidReceiveTitle(const String& title) +void FrameLoaderClientEfl::dispatchDidReceiveTitle(const StringWithDirection& title) { - CString cs = title.utf8(); + // FIXME: use direction of title. + CString cs = title.string().utf8(); ewk_frame_title_set(m_frame, cs.data()); if (ewk_view_frame_main_get(m_view) != m_frame) @@ -709,12 +710,12 @@ void FrameLoaderClientEfl::prepareForDataSourceReplacement() notImplemented(); } -void FrameLoaderClientEfl::setTitle(const String& title, const KURL& url) +void FrameLoaderClientEfl::setTitle(const StringWithDirection& title, const KURL& url) { // no need for, dispatchDidReceiveTitle is the right callback } -void FrameLoaderClientEfl::dispatchDidReceiveContentLength(DocumentLoader*, unsigned long identifier, int lengthReceived) +void FrameLoaderClientEfl::dispatchDidReceiveContentLength(DocumentLoader*, unsigned long identifier, int dataLength) { notImplemented(); } diff --git a/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h b/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h index 5ea4e8c..3efa2f5 100644 --- a/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h +++ b/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h @@ -88,7 +88,7 @@ class FrameLoaderClientEfl : public FrameLoaderClient { virtual void dispatchDidCancelAuthenticationChallenge(DocumentLoader*, unsigned long identifier, const AuthenticationChallenge&); virtual void dispatchDidReceiveResponse(DocumentLoader*, unsigned long identifier, const ResourceResponse&); - virtual void dispatchDidReceiveContentLength(DocumentLoader*, unsigned long identifier, int lengthReceived); + virtual void dispatchDidReceiveContentLength(DocumentLoader*, unsigned long identifier, int dataLength); virtual void dispatchDidFinishLoading(DocumentLoader*, unsigned long identifier); virtual void dispatchDidFailLoading(DocumentLoader*, unsigned long identifier, const ResourceError&); virtual bool dispatchDidLoadResourceFromMemoryCache(DocumentLoader*, const ResourceRequest&, const ResourceResponse&, int length); @@ -102,7 +102,7 @@ class FrameLoaderClientEfl : public FrameLoaderClient { virtual void dispatchWillClose(); virtual void dispatchDidReceiveIcon(); virtual void dispatchDidStartProvisionalLoad(); - virtual void dispatchDidReceiveTitle(const String&); + virtual void dispatchDidReceiveTitle(const StringWithDirection&); virtual void dispatchDidChangeIcons(); virtual void dispatchDidCommitLoad(); virtual void dispatchDidFailProvisionalLoad(const ResourceError&); @@ -193,7 +193,7 @@ class FrameLoaderClientEfl : public FrameLoaderClient { virtual void prepareForDataSourceReplacement(); virtual WTF::PassRefPtr<DocumentLoader> createDocumentLoader(const ResourceRequest&, const SubstituteData&); - virtual void setTitle(const String& title, const KURL&); + virtual void setTitle(const StringWithDirection& title, const KURL&); virtual String userAgent(const KURL&); |