Get more of webkit building under Linux.

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

7 files changed, 40 insertions, 37 deletions

diff --git a/build/SConscript.main b/build/SConscript.main
index 5b1b464..cfe24b4 100644
--- a/build/SConscript.main
+++ b/build/SConscript.main
@@ -323,7 +323,7 @@ elif env['PLATFORM'] == 'posix':
     # TODO: Clean up uses of ext/hash_map and remove this.
     # (see unordered_map and base/hash_tables.h)
     '-Wno-deprecated',  # Needed for using ext/hash_map on GCC 4.3
-    '-Wno-unknown-pragmas' # In wtf's ref counting system
+    '-Wno-unknown-pragmas',  # In wtf's ref counting system
   ]
   env.Replace(
       CCFLAGS = ['-m32', '-g', '-pthread'],
diff --git a/webkit/SConscript b/webkit/SConscript
index c071871..0333f25 100644
--- a/webkit/SConscript
+++ b/webkit/SConscript
@@ -100,7 +100,12 @@ env.Prepend(
     ],
 )
 
+webkit_excluded_warnings = [
+  '-Wno-multichar',
+]
+
 env.Append(
+    CXXFLAGS = webkit_excluded_warnings,
     WEBCORE_DIR = "$THIRD_PARTY_WEBKIT_DIR/WebCore",
     PENDING_DIR = "$WEBKIT_DIR/pending",
     PORT_DIR = "$WEBKIT_DIR/port",
diff --git a/webkit/SConscript.port b/webkit/SConscript.port
index 21afadf..bd4da3f 100644
--- a/webkit/SConscript.port
+++ b/webkit/SConscript.port
@@ -17,41 +17,44 @@ if env['PLATFORM'] == 'win32':
       '/wd4521',
       '/wd4800',
       ],)
+elif env['PLATFORM'] == 'posix':
+  env.Append(
+    # For the image readers and decoders:
+    CXXFLAGS = "-Wno-sign-compare",
+  )
 
 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',
 ]
 
 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.extend([
-    '$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/SkiaUtils.cpp',
-    '$PORT_DIR/platform/graphics/svg/SkiaSupport.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/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',
-  ])
-
-if env['PLATFORM'] == 'win32':
   # These files aren't win32-specific, they're just files that haven't yet been
   # made portable.
   input_files.extend([
@@ -59,9 +62,7 @@ if env['PLATFORM'] == 'win32':
     '$PORT_DIR/bridge/HistoryWin.cpp',
     '$PORT_DIR/bridge/PageWin.cpp',
     '$PORT_DIR/bridge/PluginsWin.cpp',
-    '$PORT_DIR/history/BackForwardList.cpp',
     '$PORT_DIR/loader/IconDatabaseNone.cpp',
-    '$PORT_DIR/loader/IconLoader.cpp',
     '$PORT_DIR/page/AXObjectCacheWin.cpp',
     '$PORT_DIR/page/DragControllerWin.cpp',
     '$PORT_DIR/page/EventHandlerWin.cpp',
@@ -78,7 +79,6 @@ if env['PLATFORM'] == 'win32':
     '$PORT_DIR/platform/FramelessScrollView.cpp',
     '$PORT_DIR/platform/GKURL.cpp',
     '$PORT_DIR/platform/KeyEventWin.cpp',
-    '$PORT_DIR/platform/Language.cpp',
     '$PORT_DIR/platform/LogWin.cpp',
     '$PORT_DIR/platform/MimeTypeRegistryWin.cpp',
     '$PORT_DIR/platform/PasteboardWin.cpp',
@@ -110,9 +110,8 @@ if env['PLATFORM'] == 'win32':
     '$PORT_DIR/platform/graphics/ImageSkia.cpp',
     '$PORT_DIR/platform/graphics/PlatformContextSkia.cpp',
     '$PORT_DIR/platform/graphics/SimpleFontDataWin.cpp',
+    '$PORT_DIR/platform/graphics/SkiaUtils.cpp',
     '$PORT_DIR/platform/graphics/SkGraphicsContext.cpp',
-    '$PORT_DIR/platform/graphics/SkPaintContext.cpp',
-    '$PORT_DIR/platform/graphics/svg/SVGResourceMaskerSkia.cpp',
     '$PORT_DIR/platform/network/CookieJarWin.cpp',
     '$PORT_DIR/rendering/RenderThemeWin.cpp',
   ])
diff --git a/webkit/port/page/inspector/InspectorController.cpp b/webkit/port/page/inspector/InspectorController.cpp
index 4a74d4d..a5be0b4 100644
--- a/webkit/port/page/inspector/InspectorController.cpp
+++ b/webkit/port/page/inspector/InspectorController.cpp
@@ -34,7 +34,7 @@
 #include "config.h"
 #include "InspectorController.h"
 
-#include "notimplemented.h"
+#include "NotImplemented.h"
 
 #include "CString.h"
 #include "CachedCSSStyleSheet.h"
diff --git a/webkit/port/platform/Language.cpp b/webkit/port/platform/Language.cpp
index 412da20..b21f7d4 100644
--- a/webkit/port/platform/Language.cpp
+++ b/webkit/port/platform/Language.cpp
@@ -24,7 +24,6 @@
  */
 
 #include "config.h"
-#include <windows.h>
 #include "Language.h"
 
 #include "CString.h"
diff --git a/webkit/port/platform/graphics/SkGraphicsContext.h b/webkit/port/platform/graphics/SkGraphicsContext.h
index 40bf38b..1c89ed0 100644
--- a/webkit/port/platform/graphics/SkGraphicsContext.h
+++ b/webkit/port/platform/graphics/SkGraphicsContext.h
@@ -37,7 +37,7 @@ typedef CTFontRef FontHandle;
 // compile. When the corresponding implementation to this file gets written,
 // these void pointers need to be replaced with whatever we end up using.
 typedef void* IconHandle;
-typedef void* IconHandle;
+typedef void* FontHandle;
 #endif
 
 class SkGraphicsContext {
diff --git a/webkit/port/platform/graphics/svg/SVGResourceMaskerSkia.cpp b/webkit/port/platform/graphics/svg/SVGResourceMaskerSkia.cpp
index 500957b..e430633 100644
--- a/webkit/port/platform/graphics/svg/SVGResourceMaskerSkia.cpp
+++ b/webkit/port/platform/graphics/svg/SVGResourceMaskerSkia.cpp
@@ -34,7 +34,7 @@
 #include "ImageBuffer.h"
 #include "GraphicsContext.h"
 
-#include "notimplemented.h"
+#include "NotImplemented.h"
 
 namespace WebCore {