Repair the SCons test_shell build on Windows:

* Remove the BUILDING_CHROMIUM__ definition so SCons still builds
  webkit with the currently-checked-in cairo.h shim instead of the
  new PLATFORM_SKIA definitions.
* Link with the new sdch library.
* Remove /WX from the test_shell compilation.
* Add the additional platform-specific port source files to the
  input_files list, don't replace the list with a subset.
Review URL: http://codereview.chromium.org/4282

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

3 files changed, 12 insertions, 12 deletions

diff --git a/webkit/SConscript b/webkit/SConscript
index 485d4e7..4daa31b 100644
--- a/webkit/SConscript
+++ b/webkit/SConscript
@@ -129,7 +129,10 @@ env.Append(
       ['ANDROID_CANVAS_IMPL', '1'],
       ['WEBCORE_NAVIGATOR_PLATFORM', '"\\"Win32\\""'],
       'USE_GOOGLE_URL_LIBRARY',
-      'BUILDING_CHROMIUM__',
+      # TODO:  Uncomment this when building the merged WebKit,
+      # so it uses the PLATFORM_SKIA definitions instead of
+      # the old cairo.h shim.
+      #'BUILDING_CHROMIUM__',
       'CHROMIUM_BUILD',
       '_SECURE_ATL',
 
diff --git a/webkit/SConscript.port b/webkit/SConscript.port
index 16f5072..21afadf 100644
--- a/webkit/SConscript.port
+++ b/webkit/SConscript.port
@@ -27,7 +27,7 @@ input_files = [
 if env['PLATFORM'] == 'win32':
   # TODO(erg): Temporarily disabling these until the big webkit merge is
   # complete; we're just out of date here.
-  input_files += [
+  input_files.extend([
     '$PORT_DIR/platform/graphics/AffineTransformSkia.cpp',
     '$PORT_DIR/platform/graphics/ImageSourceSkia.cpp',
     '$PORT_DIR/platform/graphics/NativeImageSkia.cpp',
@@ -49,12 +49,12 @@ if env['PLATFORM'] == 'win32':
     '$PORT_DIR/platform/image-decoders/jpeg/JPEGImageDecoder.cpp',
     '$PORT_DIR/platform/image-decoders/png/PNGImageDecoder.cpp',
     '$PORT_DIR/platform/image-decoders/xbm/XBMImageDecoder.cpp',
-  ]
+  ])
 
 if env['PLATFORM'] == 'win32':
   # These files aren't win32-specific, they're just files that haven't yet been
   # made portable.
-  input_files = [
+  input_files.extend([
     '$PORT_DIR/bridge/FrameWin.cpp',
     '$PORT_DIR/bridge/HistoryWin.cpp',
     '$PORT_DIR/bridge/PageWin.cpp',
@@ -103,6 +103,7 @@ if env['PLATFORM'] == 'win32':
     '$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',
@@ -114,14 +115,14 @@ if env['PLATFORM'] == 'win32':
     '$PORT_DIR/platform/graphics/svg/SVGResourceMaskerSkia.cpp',
     '$PORT_DIR/platform/network/CookieJarWin.cpp',
     '$PORT_DIR/rendering/RenderThemeWin.cpp',
-  ]
+  ])
 
 if env['PLATFORM'] == 'win32':
   # These are extremely win32 specific and will never be ported.
-  input_files = [
+  input_files.extend([
     '$PORT_DIR/platform/graphics/IntPointWin.cpp',
     '$PORT_DIR/platform/graphics/IntRectWin.cpp',
     '$PORT_DIR/platform/graphics/IntSizeWin.cpp',
-  ]
+  ])
 
 env.ChromeStaticLibrary("port", input_files)
diff --git a/webkit/tools/test_shell/SConscript b/webkit/tools/test_shell/SConscript
index 02c79fc..3f364b3 100644
--- a/webkit/tools/test_shell/SConscript
+++ b/webkit/tools/test_shell/SConscript
@@ -32,6 +32,7 @@ env.Append(
         'breakpad_sender',
         'googleurl',
         'net',
+        'sdch',
         'skia',
         'gtest',
         'bzip2',
@@ -55,11 +56,6 @@ env.Append(
 )
 
 env.Append(
-    CCFLAGS = [
-        '/TP',
-        '/WX',
-    ],
-
     LIBS = [
         'comctl32.lib',
         'rpcrt4.lib',