diff options
Diffstat (limited to 'WebKit/wx/WebKitSupport/FrameLoaderClientWx.h')
-rw-r--r-- | WebKit/wx/WebKitSupport/FrameLoaderClientWx.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h b/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h index 9ad4ddc..43b3a8f 100644 --- a/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h +++ b/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h @@ -31,7 +31,6 @@ #include "FrameLoaderClient.h" #include "FrameLoader.h" #include "KURL.h" -#include "RefCounted.h" #include "ResourceResponse.h" class wxWebView; @@ -48,7 +47,7 @@ namespace WebCore { struct LoadErrorResetToken; - class FrameLoaderClientWx : public FrameLoaderClient, public RefCounted<FrameLoaderClientWx> { + class FrameLoaderClientWx : public FrameLoaderClient { public: FrameLoaderClientWx(); ~FrameLoaderClientWx(); @@ -56,9 +55,6 @@ namespace WebCore { void setWebView(wxWebView *webview); virtual void detachFrameLoader(); - virtual void ref(); - virtual void deref(); - virtual bool hasWebView() const; // mainly for assertions virtual bool hasBackForwardList() const; @@ -149,6 +145,7 @@ namespace WebCore { virtual void transitionToCommittedForNewPage(); virtual void updateGlobalHistory(); + virtual void updateGlobalHistoryRedirectLinks(); virtual bool shouldGoToHistoryItem(HistoryItem*) const; virtual void saveScrollPositionAndViewStateToItem(HistoryItem*); virtual bool canCachePage() const; @@ -192,16 +189,17 @@ namespace WebCore { virtual PassRefPtr<Frame> createFrame(const KURL& url, const String& name, HTMLFrameOwnerElement* ownerElement, const String& referrer, bool allowsScrolling, int marginWidth, int marginHeight); - virtual Widget* createPlugin(const IntSize&, Element*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool loadManually) ; + virtual Widget* createPlugin(const IntSize&, HTMLPlugInElement*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool loadManually) ; virtual void redirectDataToPlugin(Widget* pluginWidget); virtual ResourceError pluginWillHandleLoadError(const ResourceResponse&); - virtual Widget* createJavaAppletWidget(const IntSize&, Element*, const KURL& baseURL, const Vector<String>& paramNames, const Vector<String>& paramValues); + virtual 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 String overrideMediaType() const; virtual void windowObjectCleared(); + virtual void documentElementAvailable(); virtual void didPerformFirstNavigation() const; |