Merge webkit.org at r51976 : Initial merge by git.

Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43

1 files changed, 32 insertions, 9 deletions

diff --git a/WebCore/wscript b/WebCore/wscript
index 3719b84..1ad8e90 100644
--- a/WebCore/wscript
+++ b/WebCore/wscript
@@ -30,30 +30,41 @@ from settings import *
 webcore_sources = {}
 
 if build_port == "wx":
-    webcore_sources['plugins'] = [  'plugins/PluginDataNone.cpp',
-                                    'plugins/PluginViewNone.cpp'
-                                  ]
-    
     if building_on_win32:
-        webcore_dirs.append('platform/wx/wxcode/win')
+        webcore_dirs.extend(['platform/wx/wxcode/win', 'plugins/win'])
         webcore_sources['wx-win'] = [
                # wxTimer on Windows has a bug that causes it to eat crashes in callbacks
                # so we need to use the Win port's implementation until the wx bug fix is
                # widely available (it was fixed in 2.8.10).
                'platform/win/SharedTimerWin.cpp',
+               # Use the Windows plugin architecture
                'page/win/PageWin.cpp',
+               'plugins/win/PluginDataWin.cpp',
+               'plugins/win/PluginDatabaseWin.cpp',
+               'plugins/win/PluginMessageThrottlerWin.cpp',
                'plugins/win/PluginPackageWin.cpp',
+               'plugins/win/PluginViewWin.cpp',
         ]
     elif sys.platform.startswith('darwin'):
+        webcore_dirs.append('plugins/mac')
         webcore_dirs.append('platform/wx/wxcode/mac/carbon')
+        webcore_dirs.append('platform/mac')
         webcore_sources['wx-mac'] = [
+               'platform/mac/WebCoreNSStringExtras.mm',
                'platform/mac/PurgeableBufferMac.cpp',
+               'plugins/wx/PluginDataWx.cpp',
+               'plugins/mac/PluginPackageMac.cpp',
+               'plugins/mac/PluginViewMac.cpp'
         ]
-        webcore_sources['plugins'].append('plugins/PluginPackageNone.cpp')
     else:
+        webcore_sources['wx-gtk'] = [
+               'plugins/PluginDataNone.cpp',
+               'plugins/PluginViewNone.cpp',
+               'plugins/PluginPackageNone.cpp'
+        ]
         webcore_dirs.append('platform/wx/wxcode/gtk')
-        webcore_sources['plugins'].append('plugins/PluginPackageNone.cpp')
         
+import TaskGen
 from TaskGen import taskgen, feature, after
 import Task, ccroot
 
@@ -81,7 +92,9 @@ def configure(conf):
 
 def build(bld):
     import Options
-
+    if sys.platform.startswith('darwin'):
+        TaskGen.task_gen.mappings['.mm'] = TaskGen.task_gen.mappings['.cxx']
+    
     wk_includes = ['.', '..', 'DerivedSources',
                 wk_root, 
                 os.path.join(wk_root, 'JavaScriptCore'),
@@ -92,8 +105,14 @@ def build(bld):
         ]
 
     features = [build_port]
+    exclude_patterns = ['*None.cpp', '*CFNet.cpp', '*Qt.cpp', '*Win.cpp', '*Wince.cpp', '*Gtk.cpp', '*Mac.cpp', '*Safari.cpp', '*Chromium*.cpp','*SVG*.cpp', '*AllInOne.cpp', 'test*bindings.*']
     if build_port == 'wx':
         features.append('curl')
+        
+    if sys.platform.startswith('darwin'):
+        features.append('cf')
+    else:
+        exclude_patterns.append('*CF.cpp')
 
     full_dirs = get_dirs_for_features(webcore_dir, features=features, dirs=webcore_dirs)
 
@@ -123,8 +142,9 @@ def build(bld):
         )
         
     excludes = []
+    
     if build_port == 'wx':
-        excludes = get_excludes(webcore_dir, ['*None.cpp', '*CF.cpp', '*Qt.cpp', '*Win.cpp', '*Wince.cpp', '*Gtk.cpp', '*Mac.cpp', '*Safari.cpp', '*Chromium*.cpp','*SVG*.cpp', '*AllInOne.cpp', 'test*bindings.*'])
+        excludes = get_excludes(webcore_dir, exclude_patterns)
         excludes.extend(['UserStyleSheetLoader.cpp', 'RenderMediaControls.cpp'])
 
 
@@ -145,5 +165,8 @@ def build(bld):
         excludes.append('JSInspectorController.cpp')
         if building_on_win32:
             excludes.append('SharedTimerWx.cpp')
+            
+        excludes.append('AuthenticationCF.cpp')
+        excludes.append('LoaderRunLoopCF.cpp')
         
     webcore.find_sources_in_dirs(full_dirs, excludes = excludes, exts=['.c', '.cpp'])