[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[kevino at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit a2f4f55cb3b0a0fc96b0e7be00eb88a9386d9a98
Author: kevino at webkit.org <kevino at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Dec 20 17:06:25 2009 +0000

    [wx] build fixes after recent changes.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52420 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d8c2687..ede9220 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2009-12-20  Kevin Ollivier  <kevino at theolliviers.com>
+
+        [wx] build fixes after recent changes.
+
+        * bindings/BindingSecurityBase.cpp: Removed V8 header in common code.
+        * platform/wx/ContextMenuWx.cpp: Added missing header.
+        * plugins/mac/PluginViewMac.cpp: Added missing header.
+
 2009-12-20  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
         Reviewed by Xan Lopez.
diff --git a/WebCore/bindings/BindingSecurityBase.cpp b/WebCore/bindings/BindingSecurityBase.cpp
index 4c473f8..0c12a6f 100644
--- a/WebCore/bindings/BindingSecurityBase.cpp
+++ b/WebCore/bindings/BindingSecurityBase.cpp
@@ -34,7 +34,6 @@
 #include "DOMWindow.h"
 #include "Frame.h"
 #include "SecurityOrigin.h"
-#include "V8BindingState.h"
 
 namespace WebCore {
 
diff --git a/WebCore/platform/wx/ContextMenuWx.cpp b/WebCore/platform/wx/ContextMenuWx.cpp
index 6f1bc9c..b20d29e 100644
--- a/WebCore/platform/wx/ContextMenuWx.cpp
+++ b/WebCore/platform/wx/ContextMenuWx.cpp
@@ -30,6 +30,8 @@
 #include "PlatformMenuDescription.h"
 #include "wx/menu.h"
 
+#include <wtf/HashMap.h>
+
 using namespace WebCore;
 
 typedef WTF::HashMap<int, ContextMenuAction> ItemActionMap;
diff --git a/WebCore/plugins/mac/PluginViewMac.cpp b/WebCore/plugins/mac/PluginViewMac.cpp
index 44a0262..33c5938 100644
--- a/WebCore/plugins/mac/PluginViewMac.cpp
+++ b/WebCore/plugins/mac/PluginViewMac.cpp
@@ -46,6 +46,7 @@
 #include "Frame.h"
 #include "FrameView.h"
 #include "GraphicsContext.h"
+#include "HostWindow.h"
 #include "HTMLNames.h"
 #include "HTMLPlugInElement.h"
 #include "Image.h"
diff --git a/WebKit/wx/ChangeLog b/WebKit/wx/ChangeLog
index e6ed389..b842511 100644
--- a/WebKit/wx/ChangeLog
+++ b/WebKit/wx/ChangeLog
@@ -1,3 +1,12 @@
+2009-12-20  Kevin Ollivier  <kevino at theolliviers.com>
+
+        [wx] build fixes after recent changes.
+
+        * WebFrame.cpp: Added missing header.
+        * WebKitSupport/EditorClientWx.cpp: Added missing header.
+        * WebView.cpp: Updated Page constructor call.
+        (wxWebView::Create):
+
 2009-12-08  Kevin Watters  <kevinwatters at gmail.com>
 
         Reviewed by Kevin Ollivier.
diff --git a/WebKit/wx/WebFrame.cpp b/WebKit/wx/WebFrame.cpp
index bd983f6..d9bb223 100644
--- a/WebKit/wx/WebFrame.cpp
+++ b/WebKit/wx/WebFrame.cpp
@@ -24,6 +24,7 @@
  */
 
 #include "config.h"
+#include "BackForwardList.h"
 #include "CString.h"
 #include "Document.h"
 #include "Editor.h"
@@ -33,6 +34,7 @@
 #include "FrameLoader.h"
 #include "FrameView.h"
 #include "HitTestResult.h"
+#include "HostWindow.h"
 #include "HTMLFrameOwnerElement.h"
 #include "markup.h"
 #include "Page.h"
diff --git a/WebKit/wx/WebKitSupport/EditorClientWx.cpp b/WebKit/wx/WebKitSupport/EditorClientWx.cpp
index bd3af48..b130557 100644
--- a/WebKit/wx/WebKitSupport/EditorClientWx.cpp
+++ b/WebKit/wx/WebKitSupport/EditorClientWx.cpp
@@ -32,6 +32,7 @@
 #include "FocusController.h"
 #include "Frame.h"
 #include "FrameView.h"
+#include "HostWindow.h"
 #include "KeyboardEvent.h"
 #include "KeyboardCodes.h"
 #include "NotImplemented.h"
diff --git a/WebKit/wx/WebView.cpp b/WebKit/wx/WebView.cpp
index 2c752de..05a7473 100644
--- a/WebKit/wx/WebView.cpp
+++ b/WebKit/wx/WebView.cpp
@@ -317,7 +317,7 @@ bool wxWebView::Create(wxWindow* parent, int id, const wxPoint& position,
     WebCore::HTMLFrameOwnerElement* parentFrame = 0;
 
     WebCore::EditorClientWx* editorClient = new WebCore::EditorClientWx();
-    m_impl->page = new WebCore::Page(new WebCore::ChromeClientWx(this), new WebCore::ContextMenuClientWx(), editorClient, new WebCore::DragClientWx(), new WebCore::InspectorClientWx(), new WebCore::EmptyPluginHalterClient());
+    m_impl->page = new WebCore::Page(new WebCore::ChromeClientWx(this), new WebCore::ContextMenuClientWx(), editorClient, new WebCore::DragClientWx(), new WebCore::InspectorClientWx(), 0, 0);
     editorClient->setPage(m_impl->page);
     
     m_mainFrame = new wxWebFrame(this);

-- 
WebKit Debian packaging