Fix the Wx build
authorhausmann@webkit.org <hausmann@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 4 Jul 2008 08:28:44 +0000 (08:28 +0000)
committerhausmann@webkit.org <hausmann@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 4 Jul 2008 08:28:44 +0000 (08:28 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@34997 268f45cc-cd09-0410-ab3c-d52691b4dbfc

JavaScriptCore/ChangeLog
JavaScriptCore/JavaScriptCoreSources.bkl
WebCore/ChangeLog
WebCore/WebCoreSources.bkl
WebCore/page/FocusController.cpp

index 27017ef..a7a0142 100644 (file)
@@ -1,3 +1,9 @@
+2008-07-04  Simon Hausmann  <hausmann@webkit.org>
+
+        Fix the Wx build, added TreeProfile.cpp to the build.
+
+        * JavaScriptCoreSources.bkl:
+
 2008-07-03  Mark Rowe  <mrowe@apple.com>
 
         Reviewed by Oliver Hunt.
index 529fefe..082f6b8 100644 (file)
@@ -124,6 +124,7 @@ Source files for JSCore.
         profiler/ProfileNode.cpp
         profiler/Profile.cpp
         profiler/Profiler.cpp
+        profiler/TreeProfile.cpp
     </set>
     <set append="1" var="JSCORE_VM_SOURCES">
         VM/CodeBlock.cpp
index 170859c..122c1bf 100644 (file)
@@ -1,5 +1,15 @@
 2008-07-04  Simon Hausmann  <hausmann@webkit.org>
 
+        Fix the Wx build.
+
+        * WebCoreSources.bkl: Add plugins/PluginMainThreadScheduler.cpp to the
+        build.
+        * page/FocusController.cpp:
+        (WebCore::FocusController::setActive): Extend MAC #ifdef to WX as
+        layoutIfNeededRecursive does not exist for the Wx port.
+
+2008-07-04  Simon Hausmann  <hausmann@webkit.org>
+
         Fix the Gtk build, adapt to renamed files.
 
         * GNUmakefile.am:
index 1cdd487..6167cae 100644 (file)
@@ -722,6 +722,7 @@ This file contains the list of files needed to build WebCore.
         plugins/PluginData.cpp
         plugins/PluginDatabase.cpp
         plugins/PluginInfoStore.cpp
+        plugins/PluginMainThreadScheduler.cpp
         plugins/PluginPackage.cpp
         plugins/PluginStream.cpp
         plugins/PluginView.cpp
index 1f6d219..de3ce33 100644 (file)
@@ -299,7 +299,7 @@ void FocusController::setActive(bool active)
     // FIXME: It would be nice to make Mac use this implementation someday.
     // Right now Mac calls updateControlTints from within WebKit, and moving
     // the call to here is not simple.
-#if !PLATFORM(MAC)
+#if !PLATFORM(MAC) && !PLATFORM(WX)
     if (FrameView* view = m_page->mainFrame()->view()) {
         view->layoutIfNeededRecursive();
         view->updateControlTints();