WebKit merge hits the SCons build, the sequel:

* Un-revert r3063 (basic file list updates).
* Un-revert r3079 (os-win32 subdirectory).
* Add icu.lib to the npapi_test_plugin.dll link.
* Add libpng.lib to the port.lib link.
* Updates for recently un-forked files.
* Incorporate Linux fixes from phajdan.jr (many thanks):
  * Add libxml/linux/include to relevant CPPPATH lists.
  * Use -Wno-error to suppress warnings-as-errors.
  * Re-order lines in ExceptionContext.
  * Remove unused WebCore::SharedBuffer declaration in SkiaUtils.h.
  * Spelling fix:  V8CSSSTyleDeclaration.h => V8CSSStyleDeclaration.h
Review URL: http://codereview.chromium.org/7024

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3118 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 121 insertions, 50 deletions

diff --git a/webkit/SConscript.port b/webkit/SConscript.port
index bd4da3f..36a93fc 100644
--- a/webkit/SConscript.port
+++ b/webkit/SConscript.port
@@ -21,52 +21,113 @@ elif env['PLATFORM'] == 'posix':
   env.Append(
     # For the image readers and decoders:
     CXXFLAGS = "-Wno-sign-compare",
+    LIBS = 'png'
   )
 
 input_files = [
-  '$PORT_DIR/css/RGBColor.cpp',
-  '$PORT_DIR/history/BackForwardList.cpp',
-  '$PORT_DIR/history/CachedPage.cpp',
-  '$PORT_DIR/loader/IconLoader.cpp',
-  '$PORT_DIR/platform/Language.cpp',
-  '$PORT_DIR/platform/TemporaryLinkStubs.cpp',
-  '$PORT_DIR/platform/graphics/AffineTransformSkia.cpp',
-  '$PORT_DIR/platform/graphics/ImageSourceSkia.cpp',
-  '$PORT_DIR/platform/graphics/NativeImageSkia.cpp',
-  '$PORT_DIR/platform/graphics/PathSkia.cpp',
-  '$PORT_DIR/platform/graphics/SkPaintContext.cpp',
-  '$PORT_DIR/platform/graphics/svg/RenderPathSkia.cpp',
-  '$PORT_DIR/platform/graphics/svg/SVGPaintServerGradientSkia.cpp',
-  '$PORT_DIR/platform/graphics/svg/SVGPaintServerPatternSkia.cpp',
-  '$PORT_DIR/platform/graphics/svg/SVGPaintServerSkia.cpp',
-  '$PORT_DIR/platform/graphics/svg/SVGPaintServerSolidSkia.cpp',
-  '$PORT_DIR/platform/graphics/svg/SVGResourceClipperSkia.cpp',
-  '$PORT_DIR/platform/graphics/svg/SVGResourceFilterSkia.cpp',
-  '$PORT_DIR/platform/graphics/svg/SVGResourceMaskerSkia.cpp',
-  '$PORT_DIR/platform/graphics/svg/SkiaSupport.cpp',
-  '$PORT_DIR/platform/image-decoders/bmp/BMPImageDecoder.cpp',
-  '$PORT_DIR/platform/image-decoders/bmp/BMPImageReader.cpp',
-  '$PORT_DIR/platform/image-decoders/gif/GIFImageDecoder.cpp',
-  '$PORT_DIR/platform/image-decoders/gif/GIFImageReader.cpp',
-  '$PORT_DIR/platform/image-decoders/ico/ICOImageDecoder.cpp',
-  '$PORT_DIR/platform/image-decoders/jpeg/JPEGImageDecoder.cpp',
-  '$PORT_DIR/platform/image-decoders/png/PNGImageDecoder.cpp',
-  '$PORT_DIR/platform/image-decoders/xbm/XBMImageDecoder.cpp',
+    '$PORT_DIR/css/RGBColor.cpp',
+
+    '$PORT_DIR/history/BackForwardList.cpp',
+    '$PORT_DIR/history/CachedPage.cpp',
+
+    '$PORT_DIR/loader/IconLoader.cpp',
+    '$PORT_DIR/loader/IconDatabaseNone.cpp',
+
+    '$PORT_DIR/page/Console.cpp',
+    '$PORT_DIR/page/Location.cpp',
+    '$PORT_DIR/page/Navigator.cpp',
+
+    '$PORT_DIR/platform/BString.cpp',
+    '$PORT_DIR/platform/FramelessScrollView.cpp',
+    '$PORT_DIR/platform/GKURL.cpp',
+    '$PORT_DIR/platform/Language.cpp',
+    '$PORT_DIR/platform/TemporaryLinkStubs.cpp',
+    '$PORT_DIR/platform/UniscribeStateTextRun.cpp',
+    '$PORT_DIR/platform/WCDataObject.cpp',
+
+    '$PORT_DIR/platform/graphics/AffineTransformSkia.cpp',
+    '$PORT_DIR/platform/graphics/ColorSkia.cpp',
+    '$PORT_DIR/platform/graphics/FloatPointSkia.cpp',
+    '$PORT_DIR/platform/graphics/FloatRectSkia.cpp',
+    '$PORT_DIR/platform/graphics/FontCustomPlatformData.cpp',
+    '$PORT_DIR/platform/graphics/GradientSkia.cpp',
+    '$PORT_DIR/platform/graphics/GraphicsContextPlatformPrivate.cpp',
+    '$PORT_DIR/platform/graphics/GraphicsContextSkia.cpp',
+    '$PORT_DIR/platform/graphics/ImageBufferSkia.cpp',
+    '$PORT_DIR/platform/graphics/ImageSkia.cpp',
+    '$PORT_DIR/platform/graphics/ImageSourceSkia.cpp',
+    '$PORT_DIR/platform/graphics/IntPointSkia.cpp',
+    '$PORT_DIR/platform/graphics/IntRectSkia.cpp',
+    '$PORT_DIR/platform/graphics/NativeImageSkia.cpp',
+    '$PORT_DIR/platform/graphics/PathSkia.cpp',
+    '$PORT_DIR/platform/graphics/PatternSkia.cpp',
+    '$PORT_DIR/platform/graphics/PlatformContextSkia.cpp',
+    '$PORT_DIR/platform/graphics/SkGraphicsContext.cpp',
+    '$PORT_DIR/platform/graphics/SkiaUtils.cpp',
+    '$PORT_DIR/platform/graphics/SkPaintContext.cpp',
+
+    '$PORT_DIR/platform/graphics/svg/RenderPathSkia.cpp',
+    '$PORT_DIR/platform/graphics/svg/SkiaSupport.cpp',
+    '$PORT_DIR/platform/graphics/svg/SVGPaintServerGradientSkia.cpp',
+    '$PORT_DIR/platform/graphics/svg/SVGPaintServerPatternSkia.cpp',
+    '$PORT_DIR/platform/graphics/svg/SVGPaintServerSkia.cpp',
+    '$PORT_DIR/platform/graphics/svg/SVGPaintServerSolidSkia.cpp',
+    '$PORT_DIR/platform/graphics/svg/SVGResourceClipperSkia.cpp',
+    '$PORT_DIR/platform/graphics/svg/SVGResourceFilterSkia.cpp',
+    '$PORT_DIR/platform/graphics/svg/SVGResourceMaskerSkia.cpp',
+
+    '$PORT_DIR/platform/image-decoders/bmp/BMPImageDecoder.cpp',
+    '$PORT_DIR/platform/image-decoders/bmp/BMPImageReader.cpp',
+    '$PORT_DIR/platform/image-decoders/gif/GIFImageDecoder.cpp',
+    #'$PENDING_DIR/GIFImageDecoder.cpp',
+    '$PORT_DIR/platform/image-decoders/gif/GIFImageReader.cpp',
+    '$PORT_DIR/platform/image-decoders/ico/ICOImageDecoder.cpp',
+    '$PORT_DIR/platform/image-decoders/jpeg/JPEGImageDecoder.cpp',
+    '$PORT_DIR/platform/image-decoders/png/PNGImageDecoder.cpp',
+    '$PORT_DIR/platform/image-decoders/xbm/XBMImageDecoder.cpp',
+
+    '$PORT_DIR/platform/network/AuthenticationChallenge.cpp',
+    '$PORT_DIR/platform/network/DNS.cpp',
+
+    '$PORT_DIR/plugins/PluginDataChromium.cpp',
 ]
 
+if env['PLATFORM'] in ('posix', 'darwin'):
+  # Remove from the list files that haven't yet been made portable
+  # to Mac and Linux.
+  remove_files = [
+    '$PORT_DIR/page/Console.cpp',
+    '$PORT_DIR/page/Location.cpp',
+    '$PORT_DIR/page/Navigator.cpp',
+    '$PORT_DIR/platform/BString.cpp',
+    '$PORT_DIR/platform/FramelessScrollView.cpp',
+    '$PORT_DIR/platform/GKURL.cpp',
+    '$PORT_DIR/platform/UniscribeStateTextRun.cpp',
+    '$PORT_DIR/platform/WCDataObject.cpp',
+    '$PORT_DIR/platform/graphics/FontCustomPlatformData.cpp',
+    '$PORT_DIR/platform/graphics/GraphicsContextSkia.cpp',
+    '$PORT_DIR/platform/graphics/ImageBufferSkia.cpp',
+    '$PORT_DIR/platform/graphics/ImageSkia.cpp',
+    '$PORT_DIR/platform/graphics/PlatformContextSkia.cpp',
+    '$PORT_DIR/platform/graphics/SkiaUtils.cpp',
+    '$PORT_DIR/platform/graphics/SkGraphicsContext.cpp',
+    '$PORT_DIR/platform/network/AuthenticationChallenge.cpp',
+    '$PORT_DIR/platform/network/DNS.cpp',
+    '$PORT_DIR/plugins/PluginDataChromium.cpp',
+  ]
+  for remove in remove_files:
+    input_files.remove(remove)
+
 if env['PLATFORM'] == 'win32':
-  # These files aren't win32-specific, they're just files that haven't yet been
-  # made portable.
+  # These are win32 specific and will never be ported.
   input_files.extend([
     '$PORT_DIR/bridge/FrameWin.cpp',
-    '$PORT_DIR/bridge/HistoryWin.cpp',
     '$PORT_DIR/bridge/PageWin.cpp',
     '$PORT_DIR/bridge/PluginsWin.cpp',
-    '$PORT_DIR/loader/IconDatabaseNone.cpp',
+    '$PORT_DIR/page/AccessibilityObjectWin.cpp',
     '$PORT_DIR/page/AXObjectCacheWin.cpp',
     '$PORT_DIR/page/DragControllerWin.cpp',
     '$PORT_DIR/page/EventHandlerWin.cpp',
-    '$PORT_DIR/platform/BString.cpp',
     '$PORT_DIR/platform/ClipboardUtilitiesWin.cpp',
     '$PORT_DIR/platform/ClipboardWin.cpp',
     '$PORT_DIR/platform/ContextMenuItemWin.cpp',
@@ -76,8 +137,6 @@ if env['PLATFORM'] == 'win32':
     '$PORT_DIR/platform/DragImageWin.cpp',
     '$PORT_DIR/platform/EditorWin.cpp',
     '$PORT_DIR/platform/FileChooserWin.cpp',
-    '$PORT_DIR/platform/FramelessScrollView.cpp',
-    '$PORT_DIR/platform/GKURL.cpp',
     '$PORT_DIR/platform/KeyEventWin.cpp',
     '$PORT_DIR/platform/LogWin.cpp',
     '$PORT_DIR/platform/MimeTypeRegistryWin.cpp',
@@ -94,34 +153,46 @@ if env['PLATFORM'] == 'win32':
     '$PORT_DIR/platform/SystemTimeWin.cpp',
     '$PORT_DIR/platform/TextBoundariesWin.cpp',
     '$PORT_DIR/platform/TextBreakIteratorInternalICUWin.cpp',
-    '$PORT_DIR/platform/UniscribeStateTextRun.cpp',
-    '$PORT_DIR/platform/WCDataObject.cpp',
     '$PORT_DIR/platform/WheelEventWin.cpp',
     '$PORT_DIR/platform/WidgetWin.cpp',
     '$PORT_DIR/platform/graphics/FontCacheWin.cpp',
-    '$PORT_DIR/platform/graphics/FontCustomPlatformData.cpp',
     '$PORT_DIR/platform/graphics/FontPlatformDataWin.cpp',
     '$PORT_DIR/platform/graphics/FontWin.cpp',
     '$PORT_DIR/platform/graphics/GlyphPageTreeNodeWin.cpp',
-    '$PORT_DIR/platform/graphics/GraphicsContextPrivate.cpp',
-    '$PORT_DIR/platform/graphics/GraphicsContextSkia.cpp',
     '$PORT_DIR/platform/graphics/IconWin.cpp',
-    '$PORT_DIR/platform/graphics/ImageBufferSkia.cpp',
-    '$PORT_DIR/platform/graphics/ImageSkia.cpp',
-    '$PORT_DIR/platform/graphics/PlatformContextSkia.cpp',
+    '$PORT_DIR/platform/graphics/IntPointWin.cpp',
+    '$PORT_DIR/platform/graphics/IntRectWin.cpp',
+    '$PORT_DIR/platform/graphics/IntSizeWin.cpp',
     '$PORT_DIR/platform/graphics/SimpleFontDataWin.cpp',
-    '$PORT_DIR/platform/graphics/SkiaUtils.cpp',
-    '$PORT_DIR/platform/graphics/SkGraphicsContext.cpp',
     '$PORT_DIR/platform/network/CookieJarWin.cpp',
+    '$PORT_DIR/platform/network/NetworkStateNotifierWin.cpp',
     '$PORT_DIR/rendering/RenderThemeWin.cpp',
   ])
 
-if env['PLATFORM'] == 'win32':
-  # These are extremely win32 specific and will never be ported.
+if env['PLATFORM'] == 'darwin':
   input_files.extend([
-    '$PORT_DIR/platform/graphics/IntPointWin.cpp',
-    '$PORT_DIR/platform/graphics/IntRectWin.cpp',
-    '$PORT_DIR/platform/graphics/IntSizeWin.cpp',
+    '$PORT_DIR/bridge/mac/FrameMac.mm',
+    '$PORT_DIR/page/EventHandlerMac.mm',
+    '$PORT_DIR/page/WebCoreFrameBridge.mm',
+    '$PORT_DIR/platform/GKURLMac.mm',
+    '$PORT_DIR/platform/PluginStubsMac.cpp',
+    '$PORT_DIR/platform/mac/ClipboardMac.mm',
+    '$PORT_DIR/platform/mac/DragDataMac.mm',
+    '$PORT_DIR/platform/mac/IntRectMac.mm',
+    '$PORT_DIR/platform/mac/PasteboardMac.mm',
+    '$PORT_DIR/platform/mac/ScrollViewMac.mm',
+    '$PORT_DIR/platform/graphics/mac/FontCacheMacPending.cpp',
+    '$PORT_DIR/rendering/RenderThemeMac.mm',
+  ])
+
+if env.get('KJS'):
+  input_files.extend([
+    '$PORT_DIR/bridge/ScriptControllerKJS.cpp',
+  ])
+else:
+  input_files.extend([
+    '$PORT_DIR/bridge/ScriptControllerV8.cpp',
+    '$PORT_DIR/bridge/ExceptionContextV8.cpp',
   ])
 
 env.ChromeStaticLibrary("port", input_files)