diff options
Diffstat (limited to 'Source/WebKit/wx/WebKitSupport')
4 files changed, 15 insertions, 11 deletions
diff --git a/Source/WebKit/wx/WebKitSupport/ChromeClientWx.cpp b/Source/WebKit/wx/WebKitSupport/ChromeClientWx.cpp index d525c09..19096de 100644 --- a/Source/WebKit/wx/WebKitSupport/ChromeClientWx.cpp +++ b/Source/WebKit/wx/WebKitSupport/ChromeClientWx.cpp @@ -460,9 +460,10 @@ void ChromeClientWx::chooseIconForFiles(const Vector<String>& filenames, FileCho chooser->iconLoaded(Icon::createIconForFiles(filenames)); } -void ChromeClientWx::setCursor(const Cursor&) +void ChromeClientWx::setCursor(const Cursor& cursor) { - notImplemented(); + if (m_webView && cursor.impl()) + m_webView->SetCursor(*cursor.impl()); } void ChromeClientWx::requestGeolocationPermissionForFrame(Frame*, Geolocation*) diff --git a/Source/WebKit/wx/WebKitSupport/EditorClientWx.h b/Source/WebKit/wx/WebKitSupport/EditorClientWx.h index d1d3597..65ee493 100644 --- a/Source/WebKit/wx/WebKitSupport/EditorClientWx.h +++ b/Source/WebKit/wx/WebKitSupport/EditorClientWx.h @@ -114,7 +114,7 @@ public: 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/wx/WebKitSupport/FrameLoaderClientWx.cpp b/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp index 68e1e70..b408636 100644 --- a/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp +++ b/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2007 Kevin Ollivier <kevino@theolliviers.com> + * Copyright (C) 2011 Apple Inc. All rights reserved. * * All rights reserved. * @@ -294,12 +295,13 @@ void FrameLoaderClientWx::dispatchDidStartProvisionalLoad() } -void FrameLoaderClientWx::dispatchDidReceiveTitle(const String& title) +void FrameLoaderClientWx::dispatchDidReceiveTitle(const StringWithDirection& title) { if (m_webView) { - m_webView->SetPageTitle(title); + // FIXME: use direction of title. + m_webView->SetPageTitle(title.string()); wxWebViewReceivedTitleEvent wkEvent(m_webView); - wkEvent.SetTitle(title); + wkEvent.SetTitle(title.string()); m_webView->GetEventHandler()->ProcessEvent(wkEvent); } } @@ -524,7 +526,7 @@ void FrameLoaderClientWx::prepareForDataSourceReplacement() } -void FrameLoaderClientWx::setTitle(const String& title, const KURL&) +void FrameLoaderClientWx::setTitle(const StringWithDirection& title, const KURL&) { notImplemented(); } @@ -870,7 +872,7 @@ void FrameLoaderClientWx::transferLoadingResourceFromPage(unsigned long, Documen { } -ObjectContentType FrameLoaderClientWx::objectContentType(const KURL& url, const String& mimeType) +ObjectContentType FrameLoaderClientWx::objectContentType(const KURL& url, const String& mimeType, bool shouldPreferPlugInsForImages) { notImplemented(); return ObjectContentType(); diff --git a/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h b/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h index 8f1e69e..b28d389 100644 --- a/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h +++ b/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2007 Kevin Ollivier <kevino@theolliviers.com> + * Copyright (C) 2011 Apple Inc. All rights reserved. * * All rights reserved. * @@ -102,7 +103,7 @@ namespace WebCore { 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 dispatchDidFinishDocumentLoad(); virtual void dispatchDidFinishLoad(); @@ -144,7 +145,7 @@ namespace WebCore { virtual void addHistoryItemForFragmentScroll(); virtual void didFinishLoad(); virtual void prepareForDataSourceReplacement(); - virtual void setTitle(const String& title, const KURL&); + virtual void setTitle(const StringWithDirection&, const KURL&); virtual String userAgent(const KURL&); @@ -217,7 +218,7 @@ namespace WebCore { virtual PassRefPtr<Widget> createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const KURL& baseURL, const Vector<String>& paramNames, const Vector<String>& paramValues); - virtual ObjectContentType objectContentType(const KURL& url, const String& mimeType); + virtual ObjectContentType objectContentType(const KURL&, const String& mimeType, bool shouldPreferPlugInsForImages); virtual String overrideMediaType() const; virtual void dispatchDidClearWindowObjectInWorld(DOMWrapperWorld*); |