AI 146110: add missing files to webkit

  brings it in sync with webkit svn cl 42046

Automated import of CL 146110

12 files changed, 146 insertions, 36 deletions

diff --git a/WebKit/wx/ChangeLog b/WebKit/wx/ChangeLog
index a7212f0..c82850a 100644
--- a/WebKit/wx/ChangeLog
+++ b/WebKit/wx/ChangeLog
@@ -1,3 +1,93 @@
+2009-03-02  Kevin Ollivier  <kevino@theolliviers.com>
+
+        Build fixes for wxWidgets Mac trunk build.
+
+        * WebView.h:
+        * bindings/python/webview.i:
+        * bindings/python/wxwebkit-py.bkl:
+        * dependencies.bkl:
+        * presets/wxwebkit.bkl:
+
+2009-02-11  Dimitri Dupuis-latour  <dupuislatour@apple.com>
+
+        Stub out InspectorClientWx::hiddenPanels.
+
+        Reviewed by Timothy Hatcher.
+
+        * WebKitSupport/InspectorClientWx.cpp:
+        (WebCore::InspectorClientWx::hiddenPanels):
+        * WebKitSupport/InspectorClientWx.h:
+
+2009-02-06  Geoffrey Garen  <ggaren@apple.com>
+
+        Build fix.
+
+        * WebKitSupport/FrameLoaderClientWx.cpp:
+        (WebCore::FrameLoaderClientWx::updateGlobalHistoryRedirectLinks):
+        * WebKitSupport/FrameLoaderClientWx.h:
+
+2009-02-05  Aaron Boodman  <aa@chromium.org>
+
+        Reviewed by Dave Hyatt.
+
+        https://bugs.webkit.org/show_bug.cgi?id=23708
+        Adds documentElementAvailable() callback to FrameLoaderClient.
+
+        * WebKitSupport/FrameLoaderClientWx.cpp:
+        (WebCore::FrameLoaderClientWx::documentElementAvailable):
+        Stub out documentElementAvailable().
+        * WebKitSupport/FrameLoaderClientWx.h:
+        Ditto.
+
+2009-02-02  Geoffrey Garen  <ggaren@apple.com>
+
+        Build fix.
+
+        * WebKitSupport/FrameLoaderClientWx.cpp:
+        (WebCore::FrameLoaderClientWx::updateGlobalHistoryForRedirectWithoutHistoryItem):
+        (WebCore::FrameLoaderClientWx::createPlugin):
+        (WebCore::FrameLoaderClientWx::createJavaAppletWidget):
+        * WebKitSupport/FrameLoaderClientWx.h:
+
+2009-02-02  Geoffrey Garen  <ggaren@apple.com>
+
+        Build fix.
+
+        * WebFrame.cpp:
+        (wxWebFrame::LoadURL):
+
+2009-01-31  Darin Adler  <darin@apple.com>
+
+        Build fix.
+
+        * WebView.cpp:
+        (wxWebView::OnSize): call sendResizeEvent on EventHandler.
+
+2009-01-29  David Kilzer  <ddkilzer@apple.com>
+
+        Build fix for Wx: Finish de-RefCount-ing FrameLoaderClientWx
+
+        * WebKitSupport/FrameLoaderClientWx.cpp:
+        (WebCore::FrameLoaderClientWx::ref): Removed.
+        (WebCore::FrameLoaderClientWx::deref): Removed.
+        * WebKitSupport/FrameLoaderClientWx.h: Ditto.
+
+2009-01-28  David Kilzer  <ddkilzer@apple.com>
+
+        Bug 23490: Remove initialRefCount argument from RefCounted class
+
+        <https://bugs.webkit.org/show_bug.cgi?id=23490>
+
+        Reviewed by Darin Adler.
+
+        FrameLoaderClientWx is no longer a RefCounted class.
+
+        * WebKitSupport/FrameLoaderClientWx.cpp:
+        (WebCore::FrameLoaderClientWx::FrameLoaderClientWx): Removed call
+        to the RefCounted<FrameLoaderClientWx>(0) super constructor.
+        * WebKitSupport/FrameLoaderClientWx.h: Don't include RefCounted.h
+        and stop inheriting from RefCounted<FrameLoaderClientWx>.
+
 2009-01-27  Brady Eidson  <beidson@apple.com>
 
         Reviewed by Dan Bernstein
diff --git a/WebKit/wx/WebFrame.cpp b/WebKit/wx/WebFrame.cpp
index 7bfcc5d..b479a41 100644
--- a/WebKit/wx/WebFrame.cpp
+++ b/WebKit/wx/WebFrame.cpp
@@ -39,16 +39,17 @@
 #include "RenderTreeAsText.h"
 #include "RenderObject.h"
 #include "RenderView.h"
-
-#include "EditorClientWx.h"
-#include "FrameLoaderClientWx.h"
-
 #include "ScriptController.h"
 #include "ScriptValue.h"
+#include "TextEncoding.h"
+
 #include "JSDOMBinding.h"
 #include <runtime/JSValue.h>
 #include <runtime/UString.h>
 
+#include "EditorClientWx.h"
+#include "FrameLoaderClientWx.h"
+
 #include "wx/wxprec.h"
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
@@ -141,7 +142,7 @@ void wxWebFrame::SetPageSource(const wxString& source, const wxString& baseUrl)
 {
     if (m_impl->frame && m_impl->frame->loader()) {
         WebCore::FrameLoader* loader = m_impl->frame->loader();
-        loader->begin(WebCore::KURL(static_cast<const char*>(baseUrl.mb_str(wxConvUTF8))));
+        loader->begin(WebCore::KURL(WebCore::KURL(), static_cast<const char*>(baseUrl.mb_str(wxConvUTF8)), WebCore::UTF8Encoding()));
         loader->write(static_cast<const WebCore::String>(source));
         loader->end();
     }
@@ -194,7 +195,7 @@ bool wxWebFrame::FindString(const wxString& string, bool forward, bool caseSensi
 void wxWebFrame::LoadURL(const wxString& url)
 {
     if (m_impl->frame && m_impl->frame->loader()) {
-        WebCore::KURL kurl = WebCore::KURL(static_cast<const char*>(url.mb_str(wxConvUTF8)));
+        WebCore::KURL kurl = WebCore::KURL(WebCore::KURL(), static_cast<const char*>(url.mb_str(wxConvUTF8)), WebCore::UTF8Encoding());
         // NB: This is an ugly fix, but CURL won't load sub-resources if the
         // protocol is omitted; sadly, it will not emit an error, either, so
         // there's no way for us to catch this problem the correct way yet.
@@ -209,7 +210,7 @@ void wxWebFrame::LoadURL(const wxString& url)
                 kurl.setPath("//" + kurl.path());
             }
         }
-        m_impl->frame->loader()->load(kurl);
+        m_impl->frame->loader()->load(kurl, false);
     }
 }
 
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();
 
diff --git a/WebKit/wx/WebView.cpp b/WebKit/wx/WebView.cpp
index 6ed8aef..94c760b 100644
--- a/WebKit/wx/WebView.cpp
+++ b/WebKit/wx/WebView.cpp
@@ -481,7 +481,7 @@ void wxWebView::OnSize(wxSizeEvent& event)
 { 
     if (m_isInitialized && m_mainFrame) {
         WebCore::Frame* frame = m_mainFrame->GetFrame();
-        frame->sendResizeEvent();
+        frame->eventHandler()->sendResizeEvent();
         frame->view()->layout();
         frame->view()->adjustScrollbars();
     }
diff --git a/WebKit/wx/WebView.h b/WebKit/wx/WebView.h
index 387d193..b041b08 100644
--- a/WebKit/wx/WebView.h
+++ b/WebKit/wx/WebView.h
@@ -58,7 +58,9 @@ namespace WebCore {
 #define WXDLLIMPEXP_WEBKIT
 #endif // SWIG
 
+#ifndef SWIG
 extern WXDLLIMPEXP_WEBKIT const wxChar* wxWebViewNameStr;
+#endif
 
 class WXDLLIMPEXP_WEBKIT wxWebView : public wxWindow
 {
diff --git a/WebKit/wx/bindings/python/webview.i b/WebKit/wx/bindings/python/webview.i
index e9926ad..44b38ab 100644
--- a/WebKit/wx/bindings/python/webview.i
+++ b/WebKit/wx/bindings/python/webview.i
@@ -31,12 +31,13 @@
 #include "WebView.h"
 #include "WebBrowserShell.h"
 %}
-
 //---------------------------------------------------------------------------
 
 %import core.i
 %import windows.i
 
+MAKE_CONST_WXSTRING(WebViewNameStr);
+
 MustHaveApp(wxWebView);
 MustHaveApp(wxWebBrowserShell);
 
diff --git a/WebKit/wx/bindings/python/wxwebkit-py.bkl b/WebKit/wx/bindings/python/wxwebkit-py.bkl
index d6c2f7a..8c49a67 100644
--- a/WebKit/wx/bindings/python/wxwebkit-py.bkl
+++ b/WebKit/wx/bindings/python/wxwebkit-py.bkl
@@ -81,9 +81,10 @@ Bakefile for wxWebKit Python bindings.
         <if cond="FORMAT=='gnu'">
             <sys-lib>png</sys-lib>
             <set var="MAC_FLAGS">
-                <if cond="WX_PORT=='mac'">-bundle -undefined dynamic_lookup</if>
+                <if cond="PLATFORM_OS=='mac'">-bundle -undefined dynamic_lookup</if>
             </set>
             
+            <sys-lib>python2.5</sys-lib>
             <ldflags>$(MAC_FLAGS)</ldflags>
         </if>
         <if cond="FORMAT in ['msvc','msvs2005prj']">
diff --git a/WebKit/wx/dependencies.bkl b/WebKit/wx/dependencies.bkl
index e9eedb4..cbdb7e3 100644
--- a/WebKit/wx/dependencies.bkl
+++ b/WebKit/wx/dependencies.bkl
@@ -139,11 +139,11 @@ and WebCore. Include this file to use these settings.
         <if cond="FORMAT=='gnu'">
             <!-- Mac includes ICU with the system, but doesn't include headers or
                  icu-config, so we have to hardcode settings there. -->
-            <set var="ICU_INCLUDE"><if cond="WX_PORT=='mac'">$(WK_ROOT)/JavaScriptCore/icu</if></set>
-            <set var="ICU_INCLUDE"><if cond="WX_PORT=='mac'">$(WK_ROOT)/WebCore/icu</if></set>
-            <set var="ICU_LIB"><if cond="WX_PORT=='mac'">icucore</if></set>
-            <set var="ICU_LDFLAGS"><if cond="WX_PORT=='gtk2'">$(DOLLAR)(shell icu-config --ldflags)</if></set>
-            <set var="ICU_CFLAGS"><if cond="WX_PORT=='gtk2'">$(DOLLAR)(shell icu-config --cppflags)</if></set>
+            <set var="ICU_INCLUDE"><if cond="PLATFORM_OS=='mac'">$(WK_ROOT)/JavaScriptCore/icu</if></set>
+            <set var="ICU_INCLUDE"><if cond="PLATFORM_OS=='mac'">$(WK_ROOT)/WebCore/icu</if></set>
+            <set var="ICU_LIB"><if cond="PLATFORM_OS=='mac'">icucore</if></set>
+            <set var="ICU_LDFLAGS"><if cond="PLATFORM_OS=='linux'">$(DOLLAR)(shell icu-config --ldflags)</if></set>
+            <set var="ICU_CFLAGS"><if cond="PLATFORM_OS=='linux'">$(DOLLAR)(shell icu-config --cppflags)</if></set>
             
             <include>$(ICU_INCLUDE)</include>
             <sys-lib>$(ICU_LIB)</sys-lib>
diff --git a/WebKit/wx/presets/wxwebkit.bkl b/WebKit/wx/presets/wxwebkit.bkl
index df21c67..026ac55 100644
--- a/WebKit/wx/presets/wxwebkit.bkl
+++ b/WebKit/wx/presets/wxwebkit.bkl
@@ -71,6 +71,17 @@ and WebCore. Include this file to use these settings.
         </option>
     </if>
     
+    <if cond="not isdefined('PLATFORM_OS')">
+        <option name="PLATFORM_OS">
+            <values>linux,mac,win</values>
+            <default-value force="1">win</default-value>
+            <description>
+                Platform the wx library is being built on
+            </description>
+        </option>
+    </if>
+    
+    
     <if cond="not isdefined('DEBUG')">
         <option name="DEBUG">
             <values>0,1</values>