4 files changed, 25 insertions, 21 deletions

diff --git a/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp b/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp
index a34576d..3cfd86e 100644
--- a/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp
+++ b/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp
@@ -70,8 +70,7 @@ inline int wxNavTypeFromWebNavType(NavigationType type){
 }
 
 FrameLoaderClientWx::FrameLoaderClientWx()
-    : RefCounted<FrameLoaderClientWx>(0)
-    , m_frame(0)
+    : m_frame(0)
 {
 }
 
@@ -95,16 +94,6 @@ void FrameLoaderClientWx::detachFrameLoader()
     m_frame = 0;
 }
 
-void FrameLoaderClientWx::ref()
-{
-    RefCounted<FrameLoaderClientWx>::ref();
-}
-
-void FrameLoaderClientWx::deref()
-{
-    RefCounted<FrameLoaderClientWx>::deref();
-}
-
 bool FrameLoaderClientWx::hasWebView() const
 {
     notImplemented();
@@ -531,6 +520,11 @@ void FrameLoaderClientWx::updateGlobalHistory()
     notImplemented();
 }
 
+void FrameLoaderClientWx::updateGlobalHistoryRedirectLinks()
+{
+    notImplemented();
+}
+
 bool FrameLoaderClientWx::shouldGoToHistoryItem(WebCore::HistoryItem*) const
 {
     notImplemented();
@@ -791,7 +785,7 @@ ObjectContentType FrameLoaderClientWx::objectContentType(const KURL& url, const
     return ObjectContentType();
 }
 
-Widget* FrameLoaderClientWx::createPlugin(const IntSize&, Element*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool loadManually)
+Widget* FrameLoaderClientWx::createPlugin(const IntSize&, HTMLPlugInElement*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool loadManually)
 {
     notImplemented();
     return 0;
@@ -809,7 +803,7 @@ ResourceError FrameLoaderClientWx::pluginWillHandleLoadError(const ResourceRespo
     return ResourceError();
 }
 
-Widget* FrameLoaderClientWx::createJavaAppletWidget(const IntSize&, Element*, const KURL& baseURL,
+Widget* FrameLoaderClientWx::createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const KURL& baseURL,
                                                     const Vector<String>& paramNames, const Vector<String>& paramValues)
 {
     notImplemented();
@@ -827,6 +821,10 @@ void FrameLoaderClientWx::windowObjectCleared()
     notImplemented();
 }
 
+void FrameLoaderClientWx::documentElementAvailable()
+{
+}
+
 void FrameLoaderClientWx::didPerformFirstNavigation() const
 {
     notImplemented();
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;
         
diff --git a/WebKit/wx/WebKitSupport/InspectorClientWx.cpp b/WebKit/wx/WebKitSupport/InspectorClientWx.cpp
index 9e87da6..75e4595 100644
--- a/WebKit/wx/WebKitSupport/InspectorClientWx.cpp
+++ b/WebKit/wx/WebKitSupport/InspectorClientWx.cpp
@@ -59,6 +59,12 @@ String InspectorClientWx::localizedStringsURL()
     return String();
 }
 
+String InspectorClientWx::hiddenPanels()
+{
+    notImplemented();
+    return String();
+}
+
 void InspectorClientWx::showWindow()
 {
     notImplemented();
diff --git a/WebKit/wx/WebKitSupport/InspectorClientWx.h b/WebKit/wx/WebKitSupport/InspectorClientWx.h
index 6dd05df..ad3ad5b 100644
--- a/WebKit/wx/WebKitSupport/InspectorClientWx.h
+++ b/WebKit/wx/WebKitSupport/InspectorClientWx.h
@@ -45,6 +45,8 @@ public:
 
     virtual String localizedStringsURL();
 
+    virtual String hiddenPanels();
+
     virtual void showWindow();
     virtual void closeWindow();