diff options
Diffstat (limited to 'Source/WebKit/wx/WebKitSupport')
6 files changed, 12 insertions, 16 deletions
diff --git a/Source/WebKit/wx/WebKitSupport/ChromeClientWx.cpp b/Source/WebKit/wx/WebKitSupport/ChromeClientWx.cpp index c89bb17..026d8a6 100644 --- a/Source/WebKit/wx/WebKitSupport/ChromeClientWx.cpp +++ b/Source/WebKit/wx/WebKitSupport/ChromeClientWx.cpp @@ -476,6 +476,11 @@ bool ChromeClientWx::selectItemWritingDirectionIsNatural() return false; } +bool ChromeClientWx::selectItemAlignmentFollowsMenuWritingDirection() +{ + return false; +} + PassRefPtr<PopupMenu> ChromeClientWx::createPopupMenu(PopupMenuClient* client) const { return adoptRef(new PopupMenuWx(client)); diff --git a/Source/WebKit/wx/WebKitSupport/ChromeClientWx.h b/Source/WebKit/wx/WebKitSupport/ChromeClientWx.h index 2ccad43..94e6504 100644 --- a/Source/WebKit/wx/WebKitSupport/ChromeClientWx.h +++ b/Source/WebKit/wx/WebKitSupport/ChromeClientWx.h @@ -139,8 +139,6 @@ public: virtual void formStateDidChange(const Node*) { } - virtual PassOwnPtr<HTMLParserQuirks> createHTMLParserQuirks() { return 0; } - virtual void setCursor(const Cursor&); virtual void scrollRectIntoView(const IntRect&, const ScrollView*) const {} @@ -149,6 +147,7 @@ public: virtual void cancelGeolocationPermissionRequestForFrame(Frame*, Geolocation*) { } virtual bool selectItemWritingDirectionIsNatural(); + virtual bool selectItemAlignmentFollowsMenuWritingDirection(); virtual PassRefPtr<PopupMenu> createPopupMenu(PopupMenuClient*) const; virtual PassRefPtr<SearchPopupMenu> createSearchPopupMenu(PopupMenuClient*) const; diff --git a/Source/WebKit/wx/WebKitSupport/DragClientWx.cpp b/Source/WebKit/wx/WebKitSupport/DragClientWx.cpp index fb6905b..75744ba 100644 --- a/Source/WebKit/wx/WebKitSupport/DragClientWx.cpp +++ b/Source/WebKit/wx/WebKitSupport/DragClientWx.cpp @@ -68,10 +68,4 @@ void DragClientWx::startDrag(DragImageRef dragImage, notImplemented(); } -DragImageRef DragClientWx::createDragImageForLink(KURL&, const String& label, Frame*) -{ - notImplemented(); - return 0; -} - } diff --git a/Source/WebKit/wx/WebKitSupport/DragClientWx.h b/Source/WebKit/wx/WebKitSupport/DragClientWx.h index afb54fb..45425c4 100644 --- a/Source/WebKit/wx/WebKitSupport/DragClientWx.h +++ b/Source/WebKit/wx/WebKitSupport/DragClientWx.h @@ -39,7 +39,6 @@ public: virtual WebCore::DragSourceAction dragSourceActionMaskForPoint(const WebCore::IntPoint&); virtual void startDrag(WebCore::DragImageRef dragImage, const WebCore::IntPoint& dragImageOrigin, const WebCore::IntPoint& eventPos, WebCore::Clipboard*, WebCore::Frame*, bool linkDrag = false); - virtual WebCore::DragImageRef createDragImageForLink(WebCore::KURL&, const WTF::String& label, WebCore::Frame*); }; } diff --git a/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp b/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp index 362c726..a10df7d 100644 --- a/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp +++ b/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp @@ -320,7 +320,7 @@ void FrameLoaderClientWx::dispatchDidFinishDocumentLoad() if (m_webView) { wxWebViewLoadEvent wkEvent(m_webView); wkEvent.SetState(wxWEBVIEW_LOAD_DOC_COMPLETED); - wkEvent.SetURL(m_frame->loader()->url().string()); + wkEvent.SetURL(m_frame->document()->url().string()); m_webView->GetEventHandler()->ProcessEvent(wkEvent); } } @@ -394,7 +394,7 @@ void FrameLoaderClientWx::postProgressFinishedNotification() if (m_webView) { wxWebViewLoadEvent wkEvent(m_webView); wkEvent.SetState(wxWEBVIEW_LOAD_DL_COMPLETED); - wkEvent.SetURL(m_frame->loader()->url().string()); + wkEvent.SetURL(m_frame->document()->url().string()); m_webView->GetEventHandler()->ProcessEvent(wkEvent); } } @@ -434,8 +434,7 @@ void FrameLoaderClientWx::finishedLoading(DocumentLoader* loader) { if (!m_pluginView) { if (m_firstData) { - FrameLoader* fl = loader->frameLoader(); - fl->writer()->setEncoding(m_response.textEncodingName(), false); + loader->writer()->setEncoding(m_response.textEncodingName(), false); m_firstData = false; } } else { @@ -595,7 +594,7 @@ void FrameLoaderClientWx::didDisplayInsecureContent() notImplemented(); } -void FrameLoaderClientWx::didRunInsecureContent(WebCore::SecurityOrigin*) +void FrameLoaderClientWx::didRunInsecureContent(WebCore::SecurityOrigin*, const KURL&) { notImplemented(); } @@ -850,7 +849,7 @@ PassRefPtr<Frame> FrameLoaderClientWx::createFrame(const KURL& url, const String if (!childFrame->page()) return 0; - childFrame->loader()->loadURLIntoChildFrame(url, referrer, childFrame.get()); + m_frame->loader()->loadURLIntoChildFrame(url, referrer, childFrame.get()); // The frame's onload handler may have removed it from the document. if (!childFrame->tree()->parent()) diff --git a/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h b/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h index b56a900..e26cbe2 100644 --- a/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h +++ b/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h @@ -167,7 +167,7 @@ namespace WebCore { virtual bool canCachePage() const; virtual void didDisplayInsecureContent(); - virtual void didRunInsecureContent(SecurityOrigin*); + virtual void didRunInsecureContent(SecurityOrigin*, const KURL&); virtual void setMainDocumentError(DocumentLoader*, const ResourceError&); virtual void committedLoad(DocumentLoader*, const char*, int); |