Start porting port. Also move perl declarations into the correct place

for posix systems. Also remove stray qualifiers in C++ files.


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

7 files changed, 134 insertions, 125 deletions

diff --git a/build/SConscript.main b/build/SConscript.main
index d45e4c7..0bef1f4 100644
--- a/build/SConscript.main
+++ b/build/SConscript.main
@@ -348,6 +348,14 @@ elif env['PLATFORM'] == 'posix':
       LINKFLAGS = ['-m32'],
       # We need pthread for threading, and rt for clock_gettime.
       LIBS = ['pthread', 'rt'],
+
+      PERL = '/usr/bin/perl',
+      PERL_INCLUDE_FLAG = '-I ',
+      PERL_INCLUDE_SUFFIX = '',
+      _PERL_INCLUDE_FLAGS = ('${_concat(PERL_INCLUDE_FLAG, '
+                             'PERL_INCLUDE_PATH, '
+                             'PERL_INCLUDE_SUFFIX,'
+                             '__env__, RDirs, TARGET, SOURCE)}'),
   )
   # Build with support for gcov when COVERAGE=1.
   if ARGUMENTS.get('COVERAGE') == '1':
diff --git a/webkit/SConscript b/webkit/SConscript
index 5e3e308..4512d83 100644
--- a/webkit/SConscript
+++ b/webkit/SConscript
@@ -40,11 +40,6 @@ port_dir = env.Dir('#/$BUILD_TYPE/webkit/port')
 port_dir.addRepository(env.Dir('#/../webkit/port'))
 port_dir.addRepository(env.Dir('#/../third_party/WebKit/WebCore'))
 
-# Point to perl. We do this so we don't have to set the +x bit on scripts
-# because we can't currently modify the third_party/WebKit repository.
-if env['PLATFORM'] == 'posix':
-  env.Append(PERL = '/usr/bin/perl')
-
 env.Prepend(
     CPPPATH = [
         '$WEBKIT_DIR/build/localized_strings',
@@ -198,12 +193,17 @@ if env['PLATFORM'] == 'win32':
         '$THIRD_PARTY_WEBKIT_DIR/JavaScriptCore/os-win32',
         ])
 else:
+    env.Prepend(CPPPATH = ['$WEBKIT_DIR/build/JSConfig/WebCore/v8'])
+
     sconscript_dirs = [
 # TODO(erg): For now, only JavaScriptCore compiles and links; the rest is next.
 #    'SConscript.port',
     'SConscript.javascriptcore_pcre',
     'build/JSConfig/SConscript',
     'build/JavaScriptCore/SConscript',
+#    'build/localized_strings/SConscript',
+    'build/port/SConscript',
+#    'build/V8Bindings/SConscript',
 #    'build/WebCore/SConscript',
     ]
 env.SConscript(sconscript_dirs, exports=['env', 'env_res'])
diff --git a/webkit/SConscript.port b/webkit/SConscript.port
index afe37a9..2cc8a32 100644
--- a/webkit/SConscript.port
+++ b/webkit/SConscript.port
@@ -31,106 +31,106 @@ Import('env')
 
 env = env.Clone()
 
-env.Prepend(
+if env['PLATFORM'] == 'win32':
+  env.Prepend(
     CCFLAGS = [
-        '/TP',
-
-        '/wd4244',
-        '/wd4291',
-        '/wd4345',
-        '/wd4521',
-        '/wd4800',
-    ],
-)
+      '/TP',
+              
+      '/wd4244',
+      '/wd4291',
+      '/wd4345',
+      '/wd4521',
+      '/wd4800',
+      ],)
 
 input_files = [
-    '$PORT_DIR/css/RGBColor.cpp',
-    '$PORT_DIR/history/CachedPage.cpp',
-    '$PORT_DIR/history/BackForwardList.cpp',
-    '$PORT_DIR/bridge/PluginsWin.cpp',
-    '$PORT_DIR/bridge/PageWin.cpp',
-    '$PORT_DIR/bridge/HistoryWin.cpp',
-    '$PORT_DIR/bridge/FrameWin.cpp',
-    '$PORT_DIR/rendering/RenderThemeWin.cpp',
-    '$PORT_DIR/platform/network/CookieJarWin.cpp',
-    '$PORT_DIR/platform/image-decoders/xbm/XBMImageDecoder.cpp',
-    '$PORT_DIR/platform/image-decoders/ico/ICOImageDecoder.cpp',
-    '$PORT_DIR/platform/image-decoders/bmp/BMPImageReader.cpp',
-    '$PORT_DIR/platform/image-decoders/bmp/BMPImageDecoder.cpp',
-    '$PORT_DIR/platform/image-decoders/png/PNGImageDecoder.cpp',
-    '$PORT_DIR/platform/image-decoders/jpeg/JPEGImageDecoder.cpp',
-    '$PORT_DIR/platform/image-decoders/gif/GIFImageReader.cpp',
-    '$PORT_DIR/platform/image-decoders/gif/GIFImageDecoder.cpp',
-    '$PORT_DIR/platform/graphics/svg/SVGResourceMaskerSkia.cpp',
-    '$PORT_DIR/platform/graphics/svg/SVGResourceFilterSkia.cpp',
-    '$PORT_DIR/platform/graphics/svg/SVGResourceClipperSkia.cpp',
-    '$PORT_DIR/platform/graphics/svg/SVGPaintServerSolidSkia.cpp',
-    '$PORT_DIR/platform/graphics/svg/SVGPaintServerSkia.cpp',
-    '$PORT_DIR/platform/graphics/svg/SVGPaintServerPatternSkia.cpp',
-    '$PORT_DIR/platform/graphics/svg/SVGPaintServerGradientSkia.cpp',
-    '$PORT_DIR/platform/graphics/svg/SkiaSupport.cpp',
-    '$PORT_DIR/platform/graphics/svg/RenderPathSkia.cpp',
-    '$PORT_DIR/platform/graphics/SkPaintContext.cpp',
-    '$PORT_DIR/platform/graphics/SkiaUtils.cpp',
-    '$PORT_DIR/platform/graphics/SkGraphicsContext.cpp',
-    '$PORT_DIR/platform/graphics/SimpleFontDataWin.cpp',
-    '$PORT_DIR/platform/graphics/PlatformContextSkia.cpp',
-    '$PORT_DIR/platform/graphics/PathSkia.cpp',
-    '$PORT_DIR/platform/graphics/IntSizeWin.cpp',
-    '$PORT_DIR/platform/graphics/IntRectWin.cpp',
-    '$PORT_DIR/platform/graphics/IntPointWin.cpp',
-    '$PORT_DIR/platform/graphics/ImageSourceSkia.cpp',
-    '$PORT_DIR/platform/graphics/ImageSkia.cpp',
-    '$PORT_DIR/platform/graphics/ImageBufferSkia.cpp',
-    '$PORT_DIR/platform/graphics/IconWin.cpp',
-    '$PORT_DIR/platform/graphics/GraphicsContextSkia.cpp',
-    '$PORT_DIR/platform/graphics/GraphicsContextPrivate.cpp',
-    '$PORT_DIR/platform/graphics/GlyphPageTreeNodeWin.cpp',
-    '$PORT_DIR/platform/graphics/FontWin.cpp',
-    '$PORT_DIR/platform/graphics/FontPlatformDataWin.cpp',
-    '$PORT_DIR/platform/graphics/FontCustomPlatformData.cpp',
-    '$PORT_DIR/platform/graphics/FontCacheWin.cpp',
-    '$PORT_DIR/platform/graphics/AffineTransformSkia.cpp',
-    '$PORT_DIR/platform/graphics/NativeImageSkia.cpp',
-    '$PORT_DIR/platform/WidgetWin.cpp',
-    '$PORT_DIR/platform/WheelEventWin.cpp',
-    '$PORT_DIR/platform/WCDataObject.cpp',
-    '$PORT_DIR/platform/UniscribeStateTextRun.cpp',
-    '$PORT_DIR/platform/TextBreakIteratorInternalICUWin.cpp',
-    '$PORT_DIR/platform/TextBoundariesWin.cpp',
-    '$PORT_DIR/platform/TemporaryLinkStubs.cpp',
-    '$PORT_DIR/platform/SystemTimeWin.cpp',
-    '$PORT_DIR/platform/SSLKeyGeneratorWin.cpp',
-    '$PORT_DIR/platform/SoundWin.cpp',
-    '$PORT_DIR/platform/SharedTimerWin.cpp',
-    '$PORT_DIR/platform/SearchPopupMenuWin.cpp',
-    '$PORT_DIR/platform/ScrollViewWin.cpp',
-    '$PORT_DIR/platform/ScreenWin.cpp',
-    '$PORT_DIR/platform/PopupMenuWin.cpp',
-    '$PORT_DIR/platform/PlatformScrollBarWin.cpp',
-    '$PORT_DIR/platform/PlatformMouseEventWin.cpp',
-    '$PORT_DIR/platform/PasteboardWin.cpp',
-    '$PORT_DIR/platform/MimeTypeRegistryWin.cpp',
-    '$PORT_DIR/platform/LogWin.cpp',
-    '$PORT_DIR/platform/Language.cpp',
-    '$PORT_DIR/platform/KeyEventWin.cpp',
-    '$PORT_DIR/platform/GKURL.cpp',
-    '$PORT_DIR/platform/FramelessScrollView.cpp',
-    '$PORT_DIR/platform/FileChooserWin.cpp',
-    '$PORT_DIR/platform/EditorWin.cpp',
-    '$PORT_DIR/platform/DragImageWin.cpp',
-    '$PORT_DIR/platform/DragDataWin.cpp',
-    '$PORT_DIR/platform/CursorWin.cpp',
-    '$PORT_DIR/platform/ContextMenuWin.cpp',
-    '$PORT_DIR/platform/ContextMenuItemWin.cpp',
-    '$PORT_DIR/platform/ClipboardWin.cpp',
-    '$PORT_DIR/platform/ClipboardUtilitiesWin.cpp',
-    '$PORT_DIR/platform/BString.cpp',
-    '$PORT_DIR/loader/IconLoader.cpp',
-    '$PORT_DIR/loader/IconDatabaseNone.cpp',
-    '$PORT_DIR/page/AXObjectCacheWin.cpp',
-    '$PORT_DIR/page/EventHandlerWin.cpp',
-    '$PORT_DIR/page/DragControllerWin.cpp',
-]
+ '$PORT_DIR/css/RGBColor.cpp',
+ '$PORT_DIR/history/CachedPage.cpp',
+ '$PORT_DIR/history/BackForwardList.cpp',
+ '$PORT_DIR/bridge/PluginsWin.cpp',
+ '$PORT_DIR/bridge/PageWin.cpp',
+ '$PORT_DIR/bridge/HistoryWin.cpp',
+ '$PORT_DIR/bridge/FrameWin.cpp',
+ '$PORT_DIR/rendering/RenderThemeWin.cpp',
+ '$PORT_DIR/platform/network/CookieJarWin.cpp',
+ '$PORT_DIR/platform/image-decoders/xbm/XBMImageDecoder.cpp',
+ '$PORT_DIR/platform/image-decoders/ico/ICOImageDecoder.cpp',
+ '$PORT_DIR/platform/image-decoders/bmp/BMPImageReader.cpp',
+ '$PORT_DIR/platform/image-decoders/bmp/BMPImageDecoder.cpp',
+ '$PORT_DIR/platform/image-decoders/png/PNGImageDecoder.cpp',
+ '$PORT_DIR/platform/image-decoders/jpeg/JPEGImageDecoder.cpp',
+ '$PORT_DIR/platform/image-decoders/gif/GIFImageReader.cpp',
+ '$PORT_DIR/platform/image-decoders/gif/GIFImageDecoder.cpp',
+ '$PORT_DIR/platform/graphics/svg/SVGResourceMaskerSkia.cpp',
+ '$PORT_DIR/platform/graphics/svg/SVGResourceFilterSkia.cpp',
+ '$PORT_DIR/platform/graphics/svg/SVGResourceClipperSkia.cpp',
+ '$PORT_DIR/platform/graphics/svg/SVGPaintServerSolidSkia.cpp',
+ '$PORT_DIR/platform/graphics/svg/SVGPaintServerSkia.cpp',
+ '$PORT_DIR/platform/graphics/svg/SVGPaintServerPatternSkia.cpp',
+ '$PORT_DIR/platform/graphics/svg/SVGPaintServerGradientSkia.cpp',
+ '$PORT_DIR/platform/graphics/svg/SkiaSupport.cpp',
+ '$PORT_DIR/platform/graphics/svg/RenderPathSkia.cpp',
+ '$PORT_DIR/platform/graphics/SkPaintContext.cpp',
+ '$PORT_DIR/platform/graphics/SkiaUtils.cpp',
+ '$PORT_DIR/platform/graphics/SkGraphicsContext.cpp',
+ '$PORT_DIR/platform/graphics/SimpleFontDataWin.cpp',
+ '$PORT_DIR/platform/graphics/PlatformContextSkia.cpp',
+ '$PORT_DIR/platform/graphics/PathSkia.cpp',
+ '$PORT_DIR/platform/graphics/IntSizeWin.cpp',
+ '$PORT_DIR/platform/graphics/IntRectWin.cpp',
+ '$PORT_DIR/platform/graphics/IntPointWin.cpp',
+ '$PORT_DIR/platform/graphics/ImageSourceSkia.cpp',
+ '$PORT_DIR/platform/graphics/ImageSkia.cpp',
+ '$PORT_DIR/platform/graphics/ImageBufferSkia.cpp',
+ '$PORT_DIR/platform/graphics/IconWin.cpp',
+ '$PORT_DIR/platform/graphics/GraphicsContextSkia.cpp',
+ '$PORT_DIR/platform/graphics/GraphicsContextPrivate.cpp',
+ '$PORT_DIR/platform/graphics/GlyphPageTreeNodeWin.cpp',
+ '$PORT_DIR/platform/graphics/FontWin.cpp',
+ '$PORT_DIR/platform/graphics/FontPlatformDataWin.cpp',
+ '$PORT_DIR/platform/graphics/FontCustomPlatformData.cpp',
+ '$PORT_DIR/platform/graphics/FontCacheWin.cpp',
+ '$PORT_DIR/platform/graphics/AffineTransformSkia.cpp',
+ '$PORT_DIR/platform/graphics/NativeImageSkia.cpp',
+ '$PORT_DIR/platform/WidgetWin.cpp',
+ '$PORT_DIR/platform/WheelEventWin.cpp',
+ '$PORT_DIR/platform/WCDataObject.cpp',
+ '$PORT_DIR/platform/UniscribeStateTextRun.cpp',
+ '$PORT_DIR/platform/TextBreakIteratorInternalICUWin.cpp',
+ '$PORT_DIR/platform/TextBoundariesWin.cpp',
+ '$PORT_DIR/platform/TemporaryLinkStubs.cpp',
+ '$PORT_DIR/platform/SystemTimeWin.cpp',
+ '$PORT_DIR/platform/SSLKeyGeneratorWin.cpp',
+ '$PORT_DIR/platform/SoundWin.cpp',
+ '$PORT_DIR/platform/SharedTimerWin.cpp',
+ '$PORT_DIR/platform/SearchPopupMenuWin.cpp',
+ '$PORT_DIR/platform/ScrollViewWin.cpp',
+ '$PORT_DIR/platform/ScreenWin.cpp',
+ '$PORT_DIR/platform/PopupMenuWin.cpp',
+ '$PORT_DIR/platform/PlatformScrollBarWin.cpp',
+ '$PORT_DIR/platform/PlatformMouseEventWin.cpp',
+ '$PORT_DIR/platform/PasteboardWin.cpp',
+ '$PORT_DIR/platform/MimeTypeRegistryWin.cpp',
+ '$PORT_DIR/platform/LogWin.cpp',
+ '$PORT_DIR/platform/Language.cpp',
+ '$PORT_DIR/platform/KeyEventWin.cpp',
+ '$PORT_DIR/platform/GKURL.cpp',
+ '$PORT_DIR/platform/FramelessScrollView.cpp',
+ '$PORT_DIR/platform/FileChooserWin.cpp',
+ '$PORT_DIR/platform/EditorWin.cpp',
+ '$PORT_DIR/platform/DragImageWin.cpp',
+ '$PORT_DIR/platform/DragDataWin.cpp',
+ '$PORT_DIR/platform/CursorWin.cpp',
+ '$PORT_DIR/platform/ContextMenuWin.cpp',
+ '$PORT_DIR/platform/ContextMenuItemWin.cpp',
+ '$PORT_DIR/platform/ClipboardWin.cpp',
+ '$PORT_DIR/platform/ClipboardUtilitiesWin.cpp',
+ '$PORT_DIR/platform/BString.cpp',
+ '$PORT_DIR/loader/IconLoader.cpp',
+ '$PORT_DIR/loader/IconDatabaseNone.cpp',
+ '$PORT_DIR/page/AXObjectCacheWin.cpp',
+ '$PORT_DIR/page/EventHandlerWin.cpp',
+ '$PORT_DIR/page/DragControllerWin.cpp',
+ ]
 
 env.ChromeStaticLibrary("port", input_files)
diff --git a/webkit/build/V8Bindings/SConscript b/webkit/build/V8Bindings/SConscript
index 227f95e..55bfa7a 100644
--- a/webkit/build/V8Bindings/SConscript
+++ b/webkit/build/V8Bindings/SConscript
@@ -32,22 +32,23 @@ Import('env')
 env = env.Clone()
 
 
-env.Prepend(
-    CPPDEFINES = [
-        'NOGDI',
-    ],
+if env['PLATFORM'] == 'win32':
+    env.Prepend(
+        CPPDEFINES = [
+                'NOGDI',
+                ],
 
-    CCFLAGS = [
-        '/TP',
+        CCFLAGS = [
+                '/TP',
 
-        '/wd4291',
-        '/wd4099',
-        '/wd4996',
-        '/wd4521',
-        '/wd4244',
-        '/wd4800',
-    ],
-)
+                '/wd4291',
+                '/wd4099',
+                '/wd4996',
+                '/wd4521',
+                '/wd4244',
+                '/wd4800',
+                ],
+        )
 
 inputs = [
     '$DERIVED_DIR/V8MimeType.cpp',
diff --git a/webkit/port/bindings/v8/v8_proxy.cpp b/webkit/port/bindings/v8/v8_proxy.cpp
index d6015b4..b5398a1 100644
--- a/webkit/port/bindings/v8/v8_proxy.cpp
+++ b/webkit/port/bindings/v8/v8_proxy.cpp
@@ -72,7 +72,7 @@
 #include "EventTarget.h"
 #include "Event.h"
 #include "HTMLInputElement.h"
-#include "xmlhttprequest.h"
+#include "XMLHttpRequest.h"
 #include "StyleSheet.h"
 #include "StyleSheetList.h"
 #include "CSSRule.h"
diff --git a/webkit/port/bindings/v8/v8_proxy.h b/webkit/port/bindings/v8/v8_proxy.h
index 27c87df..f3c5efa 100644
--- a/webkit/port/bindings/v8/v8_proxy.h
+++ b/webkit/port/bindings/v8/v8_proxy.h
@@ -348,11 +348,11 @@ class V8Proxy {
 
   // Create an instance of a function descriptor and set to the global object
   // as a named property. Used by v8_test_shell.
-  static void V8Proxy::BindJSObjectToWindow(Frame* frame,
-                                          const char* name,
-                                          int type,
-                                          v8::Handle<v8::FunctionTemplate> desc,
-                                          void* imp);
+  static void BindJSObjectToWindow(Frame* frame,
+                                   const char* name,
+                                   int type,
+                                   v8::Handle<v8::FunctionTemplate> desc,
+                                   void* imp);
 
   static v8::Handle<v8::Value> EventToV8Object(Event* event);
   static Event* ToNativeEvent(v8::Handle<v8::Value> jsevent) {
@@ -418,7 +418,7 @@ class V8Proxy {
   static v8::Handle<v8::Object> CSSRuleToV8Object(CSSRule* rule);
   // Returns the JS wrapper of a window object, initializes the environment
   // of the window frame if needed.
-  static v8::Handle<v8::Object> V8Proxy::WindowToV8Object(DOMWindow* window);
+  static v8::Handle<v8::Object> WindowToV8Object(DOMWindow* window);
 
 #if ENABLE(SVG)
   static v8::Handle<v8::Object> SVGElementInstanceToV8Object(
diff --git a/webkit/port/css/RGBColor.h b/webkit/port/css/RGBColor.h
index c29a288..239d406 100644
--- a/webkit/port/css/RGBColor.h
+++ b/webkit/port/css/RGBColor.h
@@ -38,7 +38,7 @@ namespace WebCore {
 
 class RGBColor : public RefCounted<RGBColor> {
  public:
-  RGBColor::RGBColor(unsigned rgbcolor) : m_rgbcolor(rgbcolor) { }
+  RGBColor(unsigned rgbcolor) : m_rgbcolor(rgbcolor) { }
 
   CSSPrimitiveValue* red();
   CSSPrimitiveValue* green();