Wow, it's been a while since we cleaned EOL.

Ran dos2unix on *.cc, *.h, *.py and SCons*.*
Ran for /R /D %a in (*.*) do @if exist %a\.svn\. svn pset svn:eol-style LF %a\*.cc
Ran for /R /D %a in (*.*) do @if exist %a\.svn\. svn pset svn:eol-style LF %a\*.h
Ran for /R /D %a in (*.*) do @if exist %a\.svn\. svn pset svn:eol-style LF %a\*.py
Ran for /R /D %a in (*.*) do @if exist %a\.svn\. svn pset svn:eol-style LF %a\SCons*.*



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

5 files changed, 304 insertions, 304 deletions

diff --git a/gears/SConscript.libgd b/gears/SConscript.libgd
index fb3c25c..652e4e1 100644
--- a/gears/SConscript.libgd
+++ b/gears/SConscript.libgd
@@ -1,80 +1,80 @@
-# Copyright (c) 2008 The Chromium Authors. All rights reserved.

-# Use of this source code is governed by a BSD-style license that can be

-# found in the LICENSE file.

-

-# Ripped and modded from chrome.

-

-Import('env')

-

-env = env.Clone(

-)

-

-env.Replace(

-    LIBGD_DIR = '$THIRD_PARTY_DIR/libgd',

-    CPPPATH = [

-        '$LIBGD_DIR',

-        '$THIRD_PARTY_DIR/libjpeg',

-        '$THIRD_PARTY_DIR/libpng',

-        '$THIRD_PARTY_DIR/zlib',

-    ],

-)

-

-env.Append(

-    CPPDEFINES = [

-        'HAVE_CONFIG_H',

-	'BGDWIN32',

-    ],

-

-)

- 

-if env['PLATFORM'] == 'win32':

-  env.Append(

-      CPPFLAGS = [

-# Disable some warnings when building third-party code, so we can enable /WX.

-# Examples:

-#   warning C4244: conversion from 'type1' to 'type2', possible loss of data

-#   warning C4018: signed/unsigned mismatch in comparison

-#   warning C4003: not enough actual parameters for macro

-          '/wd4244',

-          '/wd4996',

-          '/wd4005',

-          '/wd4142',

-          '/wd4018',

-          '/wd4133',

-          '/wd4102',

-      ],

-  )

-

-

-input_files = [

-        '$LIBGD_DIR/gd.c',

-        '$LIBGD_DIR/gdfx.c',

-        '$LIBGD_DIR/gd_security.c',

-        '$LIBGD_DIR/gd_gd.c',

-        '$LIBGD_DIR/gd_gd2.c',

-        '$LIBGD_DIR/gd_io.c',

-        '$LIBGD_DIR/gd_io_dp.c',

-        '$LIBGD_DIR/gd_gif_in.c',

-        '$LIBGD_DIR/gd_gif_out.c',

-        '$LIBGD_DIR/gd_io_file.c',

-        '$LIBGD_DIR/gd_io_ss.c',

-        '$LIBGD_DIR/gd_jpeg.c',

-        '$LIBGD_DIR/gd_png.c',

-        '$LIBGD_DIR/gd_ss.c',

-        '$LIBGD_DIR/gd_topal.c',

-        '$LIBGD_DIR/gd_wbmp.c',

-        '$LIBGD_DIR/gdcache.c',

-        '$LIBGD_DIR/gdfontg.c',

-        '$LIBGD_DIR/gdfontl.c',

-        '$LIBGD_DIR/gdfontmb.c',

-        '$LIBGD_DIR/gdfonts.c',

-        '$LIBGD_DIR/gdfontt.c',

-        '$LIBGD_DIR/gdft.c',

-        '$LIBGD_DIR/gdhelpers.c',

-        '$LIBGD_DIR/gdkanji.c',

-        '$LIBGD_DIR/gdtables.c',

-        '$LIBGD_DIR/gdxpm.c',

-        '$LIBGD_DIR/wbmp.c',

-]

-

-env.ChromeStaticLibrary('gd', input_files)

+# Copyright (c) 2008 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# Ripped and modded from chrome.
+
+Import('env')
+
+env = env.Clone(
+)
+
+env.Replace(
+    LIBGD_DIR = '$THIRD_PARTY_DIR/libgd',
+    CPPPATH = [
+        '$LIBGD_DIR',
+        '$THIRD_PARTY_DIR/libjpeg',
+        '$THIRD_PARTY_DIR/libpng',
+        '$THIRD_PARTY_DIR/zlib',
+    ],
+)
+
+env.Append(
+    CPPDEFINES = [
+        'HAVE_CONFIG_H',
+	'BGDWIN32',
+    ],
+
+)
+ 
+if env['PLATFORM'] == 'win32':
+  env.Append(
+      CPPFLAGS = [
+# Disable some warnings when building third-party code, so we can enable /WX.
+# Examples:
+#   warning C4244: conversion from 'type1' to 'type2', possible loss of data
+#   warning C4018: signed/unsigned mismatch in comparison
+#   warning C4003: not enough actual parameters for macro
+          '/wd4244',
+          '/wd4996',
+          '/wd4005',
+          '/wd4142',
+          '/wd4018',
+          '/wd4133',
+          '/wd4102',
+      ],
+  )
+
+
+input_files = [
+        '$LIBGD_DIR/gd.c',
+        '$LIBGD_DIR/gdfx.c',
+        '$LIBGD_DIR/gd_security.c',
+        '$LIBGD_DIR/gd_gd.c',
+        '$LIBGD_DIR/gd_gd2.c',
+        '$LIBGD_DIR/gd_io.c',
+        '$LIBGD_DIR/gd_io_dp.c',
+        '$LIBGD_DIR/gd_gif_in.c',
+        '$LIBGD_DIR/gd_gif_out.c',
+        '$LIBGD_DIR/gd_io_file.c',
+        '$LIBGD_DIR/gd_io_ss.c',
+        '$LIBGD_DIR/gd_jpeg.c',
+        '$LIBGD_DIR/gd_png.c',
+        '$LIBGD_DIR/gd_ss.c',
+        '$LIBGD_DIR/gd_topal.c',
+        '$LIBGD_DIR/gd_wbmp.c',
+        '$LIBGD_DIR/gdcache.c',
+        '$LIBGD_DIR/gdfontg.c',
+        '$LIBGD_DIR/gdfontl.c',
+        '$LIBGD_DIR/gdfontmb.c',
+        '$LIBGD_DIR/gdfonts.c',
+        '$LIBGD_DIR/gdfontt.c',
+        '$LIBGD_DIR/gdft.c',
+        '$LIBGD_DIR/gdhelpers.c',
+        '$LIBGD_DIR/gdkanji.c',
+        '$LIBGD_DIR/gdtables.c',
+        '$LIBGD_DIR/gdxpm.c',
+        '$LIBGD_DIR/wbmp.c',
+]
+
+env.ChromeStaticLibrary('gd', input_files)
diff --git a/gears/SConscript.libjpeg b/gears/SConscript.libjpeg
index 69c338e..5931eb6 100644
--- a/gears/SConscript.libjpeg
+++ b/gears/SConscript.libjpeg
@@ -1,74 +1,74 @@
-# Copyright (c) 2008 The Chromium Authors. All rights reserved.

-# Use of this source code is governed by a BSD-style license that can be

-# found in the LICENSE file.

-

-# Ripped and modded from chrome.

-

-Import('env')

-

-env = env.Clone(

-    LIBJPEG_DIR = ''

-)

-

-env.Replace(

-    LIBJPEG_DIR = '$THIRD_PARTY_DIR/libjpeg',

-    CPPPATH = [

-        '$LIBJPEG_DIR',

-    ],

-)

-

-#env.Append(

-#    CPPDEFINES = [

-#    ],

-#)

- 

-input_files = [

-    '$LIBJPEG_DIR/jcapimin.c',

-    '$LIBJPEG_DIR/jcapistd.c',

-    '$LIBJPEG_DIR/jccoefct.c',

-    '$LIBJPEG_DIR/jccolor.c',

-    '$LIBJPEG_DIR/jcdctmgr.c',

-    '$LIBJPEG_DIR/jchuff.c',

-    '$LIBJPEG_DIR/jcinit.c',

-    '$LIBJPEG_DIR/jcmainct.c',

-    '$LIBJPEG_DIR/jcmarker.c',

-    '$LIBJPEG_DIR/jcmaster.c',

-    '$LIBJPEG_DIR/jcomapi.c',

-    '$LIBJPEG_DIR/jcparam.c',

-    '$LIBJPEG_DIR/jcphuff.c',

-    '$LIBJPEG_DIR/jcprepct.c',

-    '$LIBJPEG_DIR/jcsample.c',

-    '$LIBJPEG_DIR/jctrans.c',

-    '$LIBJPEG_DIR/jdapimin.c',

-    '$LIBJPEG_DIR/jdapistd.c',

-    '$LIBJPEG_DIR/jdatadst.c',

-    '$LIBJPEG_DIR/jdatasrc.c',

-    '$LIBJPEG_DIR/jdcoefct.c',

-    '$LIBJPEG_DIR/jdcolor.c',

-    '$LIBJPEG_DIR/jddctmgr.c',

-    '$LIBJPEG_DIR/jdhuff.c',

-    '$LIBJPEG_DIR/jdinput.c',

-    '$LIBJPEG_DIR/jdmainct.c',

-    '$LIBJPEG_DIR/jdmarker.c',

-    '$LIBJPEG_DIR/jdmaster.c',

-    '$LIBJPEG_DIR/jdmerge.c',

-    '$LIBJPEG_DIR/jdphuff.c',

-    '$LIBJPEG_DIR/jdpostct.c',

-    '$LIBJPEG_DIR/jdsample.c',

-    '$LIBJPEG_DIR/jdtrans.c',

-    '$LIBJPEG_DIR/jerror.c',

-    '$LIBJPEG_DIR/jfdctflt.c',

-    '$LIBJPEG_DIR/jfdctfst.c',

-    '$LIBJPEG_DIR/jfdctint.c',

-    '$LIBJPEG_DIR/jidctflt.c',

-    '$LIBJPEG_DIR/jidctfst.c',

-    '$LIBJPEG_DIR/jidctint.c',

-    '$LIBJPEG_DIR/jidctred.c',

-    '$LIBJPEG_DIR/jquant1.c',

-    '$LIBJPEG_DIR/jquant2.c',

-    '$LIBJPEG_DIR/jutils.c',

-    '$LIBJPEG_DIR/jmemmgr.c',

-    '$LIBJPEG_DIR/jmemnobs.c',

-]

-

-env.ChromeStaticLibrary('jpeg', input_files)

+# Copyright (c) 2008 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# Ripped and modded from chrome.
+
+Import('env')
+
+env = env.Clone(
+    LIBJPEG_DIR = ''
+)
+
+env.Replace(
+    LIBJPEG_DIR = '$THIRD_PARTY_DIR/libjpeg',
+    CPPPATH = [
+        '$LIBJPEG_DIR',
+    ],
+)
+
+#env.Append(
+#    CPPDEFINES = [
+#    ],
+#)
+ 
+input_files = [
+    '$LIBJPEG_DIR/jcapimin.c',
+    '$LIBJPEG_DIR/jcapistd.c',
+    '$LIBJPEG_DIR/jccoefct.c',
+    '$LIBJPEG_DIR/jccolor.c',
+    '$LIBJPEG_DIR/jcdctmgr.c',
+    '$LIBJPEG_DIR/jchuff.c',
+    '$LIBJPEG_DIR/jcinit.c',
+    '$LIBJPEG_DIR/jcmainct.c',
+    '$LIBJPEG_DIR/jcmarker.c',
+    '$LIBJPEG_DIR/jcmaster.c',
+    '$LIBJPEG_DIR/jcomapi.c',
+    '$LIBJPEG_DIR/jcparam.c',
+    '$LIBJPEG_DIR/jcphuff.c',
+    '$LIBJPEG_DIR/jcprepct.c',
+    '$LIBJPEG_DIR/jcsample.c',
+    '$LIBJPEG_DIR/jctrans.c',
+    '$LIBJPEG_DIR/jdapimin.c',
+    '$LIBJPEG_DIR/jdapistd.c',
+    '$LIBJPEG_DIR/jdatadst.c',
+    '$LIBJPEG_DIR/jdatasrc.c',
+    '$LIBJPEG_DIR/jdcoefct.c',
+    '$LIBJPEG_DIR/jdcolor.c',
+    '$LIBJPEG_DIR/jddctmgr.c',
+    '$LIBJPEG_DIR/jdhuff.c',
+    '$LIBJPEG_DIR/jdinput.c',
+    '$LIBJPEG_DIR/jdmainct.c',
+    '$LIBJPEG_DIR/jdmarker.c',
+    '$LIBJPEG_DIR/jdmaster.c',
+    '$LIBJPEG_DIR/jdmerge.c',
+    '$LIBJPEG_DIR/jdphuff.c',
+    '$LIBJPEG_DIR/jdpostct.c',
+    '$LIBJPEG_DIR/jdsample.c',
+    '$LIBJPEG_DIR/jdtrans.c',
+    '$LIBJPEG_DIR/jerror.c',
+    '$LIBJPEG_DIR/jfdctflt.c',
+    '$LIBJPEG_DIR/jfdctfst.c',
+    '$LIBJPEG_DIR/jfdctint.c',
+    '$LIBJPEG_DIR/jidctflt.c',
+    '$LIBJPEG_DIR/jidctfst.c',
+    '$LIBJPEG_DIR/jidctint.c',
+    '$LIBJPEG_DIR/jidctred.c',
+    '$LIBJPEG_DIR/jquant1.c',
+    '$LIBJPEG_DIR/jquant2.c',
+    '$LIBJPEG_DIR/jutils.c',
+    '$LIBJPEG_DIR/jmemmgr.c',
+    '$LIBJPEG_DIR/jmemnobs.c',
+]
+
+env.ChromeStaticLibrary('jpeg', input_files)
diff --git a/gears/SConscript.libpng b/gears/SConscript.libpng
index d184d53..5cdff50 100644
--- a/gears/SConscript.libpng
+++ b/gears/SConscript.libpng
@@ -1,52 +1,52 @@
-# Copyright (c) 2008 The Chromium Authors. All rights reserved.

-# Use of this source code is governed by a BSD-style license that can be

-# found in the LICENSE file.

-

-# Ripped and modded from chrome.

-

-Import('env')

-

-env = env.Clone(

-)

-

-env.Replace(

-    LIBPNG_DIR = '$THIRD_PARTY_DIR/libpng',

-    CPPPATH = [

-        '$LIBPNG_DIR',

-        '$THIRD_PARTY_DIR/zlib',

-    ],

-)

-

-env.Append(

-    CPPDEFINES = [

-    ],

-)

- 

-input_files = [

-    # Common Files

-    '$LIBPNG_DIR/png.c',

-    '$LIBPNG_DIR/pngerror.c',

-    '$LIBPNG_DIR/pngget.c',

-    '$LIBPNG_DIR/pngmem.c',

-    '$LIBPNG_DIR/pngset.c',

-    '$LIBPNG_DIR/pngtrans.c',

-

-    # Reading PNGs

-    '$LIBPNG_DIR/pngpread.c',

-    '$LIBPNG_DIR/pngread.c',

-    '$LIBPNG_DIR/pngrio.c',

-    '$LIBPNG_DIR/pngrtran.c',

-    '$LIBPNG_DIR/pngrutil.c',

-]

-

-# The following files are not yet needed; exclude them to save size.

-if not env['OFFICIAL_BUILD']:

-  input_files += [

-      # Writing PNGs

-      '$LIBPNG_DIR/pngwio.c',

-      '$LIBPNG_DIR/pngwrite.c',

-      '$LIBPNG_DIR/pngwtran.c',

-      '$LIBPNG_DIR/pngwutil.c',

-  ]

-

-env.ChromeStaticLibrary('png', input_files)

+# Copyright (c) 2008 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# Ripped and modded from chrome.
+
+Import('env')
+
+env = env.Clone(
+)
+
+env.Replace(
+    LIBPNG_DIR = '$THIRD_PARTY_DIR/libpng',
+    CPPPATH = [
+        '$LIBPNG_DIR',
+        '$THIRD_PARTY_DIR/zlib',
+    ],
+)
+
+env.Append(
+    CPPDEFINES = [
+    ],
+)
+ 
+input_files = [
+    # Common Files
+    '$LIBPNG_DIR/png.c',
+    '$LIBPNG_DIR/pngerror.c',
+    '$LIBPNG_DIR/pngget.c',
+    '$LIBPNG_DIR/pngmem.c',
+    '$LIBPNG_DIR/pngset.c',
+    '$LIBPNG_DIR/pngtrans.c',
+
+    # Reading PNGs
+    '$LIBPNG_DIR/pngpread.c',
+    '$LIBPNG_DIR/pngread.c',
+    '$LIBPNG_DIR/pngrio.c',
+    '$LIBPNG_DIR/pngrtran.c',
+    '$LIBPNG_DIR/pngrutil.c',
+]
+
+# The following files are not yet needed; exclude them to save size.
+if not env['OFFICIAL_BUILD']:
+  input_files += [
+      # Writing PNGs
+      '$LIBPNG_DIR/pngwio.c',
+      '$LIBPNG_DIR/pngwrite.c',
+      '$LIBPNG_DIR/pngwtran.c',
+      '$LIBPNG_DIR/pngwutil.c',
+  ]
+
+env.ChromeStaticLibrary('png', input_files)
diff --git a/gears/SConscript.portaudio b/gears/SConscript.portaudio
index f318c01..6987457 100644
--- a/gears/SConscript.portaudio
+++ b/gears/SConscript.portaudio
@@ -1,51 +1,51 @@
-# Copyright (c) 2008 The Chromium Authors. All rights reserved.

-# Use of this source code is governed by a BSD-style license that can be

-# found in the LICENSE file.

-

-Import('env')

-

-env = env.Clone(

-)

-

-env.Replace(

-    PA_DIR = '$THIRD_PARTY_DIR/portaudio',

-    CPPPATH = [

-        '$PA_DIR/include',

-        '$PA_DIR/src/common',

-	'$PA_DIR/src/os/win',

-    ],

-)

-

-env.Append(

-    CPPDEFINES = [

-        'PA_NO_DS',

-        'PA_NO_ASIO',

-    ],

-)

-

-if env['PLATFORM'] == 'win32':

-  env.Append(

-      CPPFLAGS = [

-          '/wd4133',

-          '/wd4101',

-      ],

-  )

- 

-input_files = [

-    '$PA_DIR/src/common/pa_allocation.c',

-    '$PA_DIR/src/common/pa_converters.c',

-    '$PA_DIR/src/common/pa_cpuload.c',

-    '$PA_DIR/src/common/pa_debugprint.c',

-    '$PA_DIR/src/common/pa_dither.c',

-    '$PA_DIR/src/common/pa_front.c',

-    '$PA_DIR/src/common/pa_process.c',

-    '$PA_DIR/src/common/pa_skeleton.c',

-    '$PA_DIR/src/common/pa_stream.c',

-    '$PA_DIR/src/common/pa_trace.c',

-    '$PA_DIR/src/hostapi/wmme/pa_win_wmme.c',

-    '$PA_DIR/src/os/win/pa_win_hostapis.c',

-    '$PA_DIR/src/os/win/pa_win_util.c',

-    '$PA_DIR/src/os/win/pa_win_waveformat.c',

-]

-

-env.ChromeStaticLibrary('portaudio', input_files)

+# Copyright (c) 2008 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+Import('env')
+
+env = env.Clone(
+)
+
+env.Replace(
+    PA_DIR = '$THIRD_PARTY_DIR/portaudio',
+    CPPPATH = [
+        '$PA_DIR/include',
+        '$PA_DIR/src/common',
+	'$PA_DIR/src/os/win',
+    ],
+)
+
+env.Append(
+    CPPDEFINES = [
+        'PA_NO_DS',
+        'PA_NO_ASIO',
+    ],
+)
+
+if env['PLATFORM'] == 'win32':
+  env.Append(
+      CPPFLAGS = [
+          '/wd4133',
+          '/wd4101',
+      ],
+  )
+ 
+input_files = [
+    '$PA_DIR/src/common/pa_allocation.c',
+    '$PA_DIR/src/common/pa_converters.c',
+    '$PA_DIR/src/common/pa_cpuload.c',
+    '$PA_DIR/src/common/pa_debugprint.c',
+    '$PA_DIR/src/common/pa_dither.c',
+    '$PA_DIR/src/common/pa_front.c',
+    '$PA_DIR/src/common/pa_process.c',
+    '$PA_DIR/src/common/pa_skeleton.c',
+    '$PA_DIR/src/common/pa_stream.c',
+    '$PA_DIR/src/common/pa_trace.c',
+    '$PA_DIR/src/hostapi/wmme/pa_win_wmme.c',
+    '$PA_DIR/src/os/win/pa_win_hostapis.c',
+    '$PA_DIR/src/os/win/pa_win_util.c',
+    '$PA_DIR/src/os/win/pa_win_waveformat.c',
+]
+
+env.ChromeStaticLibrary('portaudio', input_files)
diff --git a/gears/SConscript.zlib b/gears/SConscript.zlib
index 46eceec..4049073 100644
--- a/gears/SConscript.zlib
+++ b/gears/SConscript.zlib
@@ -1,47 +1,47 @@
-# Copyright (c) 2008 The Chromium Authors. All rights reserved.

-# Use of this source code is governed by a BSD-style license that can be

-# found in the LICENSE file.

-

-# Ripped and modded from chrome.

-

-Import('env')

-

-env = env.Clone(

-)

-

-env.Replace(

-    ZLIB_DIR = '$THIRD_PARTY_DIR/zlib',

-    CPPPATH = [

-        '$ZLIB_DIR',

-    ],

-)

-

-#env.Append(

-#    CPPDEFINES = [

-#    ],

-#)

- 

-input_files = [

-    # Common Files

-    '$ZLIB_DIR/adler32.c',

-    '$ZLIB_DIR/zutil.c',

-    # Inflate Algorithm (use inflate or infback, but not both)

-    '$ZLIB_DIR/inflate.c',

-    '$ZLIB_DIR/inffast.c',

-    '$ZLIB_DIR/inftrees.c',

-]

-

-# The following files are not yet needed; exclude them to save size.

-if not env['OFFICIAL_BUILD']:

-  input_files += [

-      # Other Algorithms

-      '$ZLIB_DIR/compress.c',

-      '$ZLIB_DIR/deflate.c',

-      '$ZLIB_DIR/uncompr.c',

-      # Other Common Files

-      '$ZLIB_DIR/crc32.c',

-      '$ZLIB_DIR/gzio.c',

-      '$ZLIB_DIR/trees.c',

-  ]

-

-env.ChromeStaticLibrary('zlib-gears', input_files)

+# Copyright (c) 2008 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# Ripped and modded from chrome.
+
+Import('env')
+
+env = env.Clone(
+)
+
+env.Replace(
+    ZLIB_DIR = '$THIRD_PARTY_DIR/zlib',
+    CPPPATH = [
+        '$ZLIB_DIR',
+    ],
+)
+
+#env.Append(
+#    CPPDEFINES = [
+#    ],
+#)
+ 
+input_files = [
+    # Common Files
+    '$ZLIB_DIR/adler32.c',
+    '$ZLIB_DIR/zutil.c',
+    # Inflate Algorithm (use inflate or infback, but not both)
+    '$ZLIB_DIR/inflate.c',
+    '$ZLIB_DIR/inffast.c',
+    '$ZLIB_DIR/inftrees.c',
+]
+
+# The following files are not yet needed; exclude them to save size.
+if not env['OFFICIAL_BUILD']:
+  input_files += [
+      # Other Algorithms
+      '$ZLIB_DIR/compress.c',
+      '$ZLIB_DIR/deflate.c',
+      '$ZLIB_DIR/uncompr.c',
+      # Other Common Files
+      '$ZLIB_DIR/crc32.c',
+      '$ZLIB_DIR/gzio.c',
+      '$ZLIB_DIR/trees.c',
+  ]
+
+env.ChromeStaticLibrary('zlib-gears', input_files)