Add skia and our png wrappers. png_codec_unittest and image_operations_unittest pass. This gives us 70 passing unittests.

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

4 files changed, 162 insertions, 159 deletions

diff --git a/base/SConscript b/base/SConscript
index 228e884..719b019 100644
--- a/base/SConscript
+++ b/base/SConscript
@@ -227,12 +227,6 @@ if env['PLATFORM'] == 'win32':
       ],
   )
 
-if env['PLATFORM'] == 'posix':
-  # Remove the libraries that don't build yet under Linux.
-  env_tests['LIBS'].remove('skia')
-  env_tests['LIBS'].remove('libpng')
-  env_tests['LIBS'].remove('zlib')
-
 # These test files work on *all* platforms; tests that don't work
 # cross-platform live below.
 test_files = [
@@ -254,6 +248,8 @@ test_files = [
     'values_unittest.cc',
     'waitable_event_unittest.cc',
     'gfx/convolver_unittest.cc',
+    'gfx/image_operations_unittest.cc',
+    'gfx/png_codec_unittest.cc',
     'gfx/rect_unittest.cc',
 ]
 
@@ -284,10 +280,8 @@ if env['PLATFORM'] == 'win32':
     'timer_unittest.cc',
     'tracked_objects_test.cc',
     'word_iterator_unittest.cc',
-    'gfx/image_operations_unittest.cc',
     'gfx/native_theme_unittest.cc',
     'gfx/platform_canvas_unittest.cc',
-    'gfx/png_codec_unittest.cc',
     'gfx/uniscribe_unittest.cc',
     'gfx/vector_canvas_unittest.cc',
   ])
diff --git a/base/gfx/SConscript b/base/gfx/SConscript
index 40e6d51..37939f8 100644
--- a/base/gfx/SConscript
+++ b/base/gfx/SConscript
@@ -63,10 +63,13 @@ if env['PLATFORM'] == 'win32':
   )
 
 input_files = [
-    'convolver.cc',
-    'point.cc',
-    'rect.cc',
-    'size.cc',
+  'convolver.cc',
+  'image_operations.cc',
+  'png_decoder.cc',
+  'png_encoder.cc',
+  'point.cc',
+  'rect.cc',
+  'size.cc',
 ]
 
 if env['PLATFORM'] == 'win32':
@@ -75,10 +78,7 @@ if env['PLATFORM'] == 'win32':
   input_files.extend([
     'bitmap_header.cc',
     'font_utils.cc',
-    'image_operations.cc',
     'native_theme.cc',
-    'png_decoder.cc',
-    'png_encoder.cc',
     'skia_utils.cc',
     'uniscribe.cc',
     'vector_canvas.cc',
diff --git a/build/SConscript.main b/build/SConscript.main
index d1599d4..26649f3 100644
--- a/build/SConscript.main
+++ b/build/SConscript.main
@@ -306,7 +306,7 @@ elif env['PLATFORM'] == 'posix':
   SetOption('num_jobs', cpus + 1)
 
   # For now, linux only loads the components we know work on Linux, by default.
-  load = ['base', 'testing', 'third_party', 'breakpad']
+  load = ['base', 'testing', 'third_party', 'breakpad', 'skia']
 
   env.Replace(
       # TODO(linux): we should also compile with -Werror, but not yet.
diff --git a/skia/SConscript b/skia/SConscript
index 4c66ae9..e76aaf9 100644
--- a/skia/SConscript
+++ b/skia/SConscript
@@ -32,162 +32,171 @@ Import('env')
 env = env.Clone()
 
 env.Prepend(
-    CPPPATH = [
-        'include',
-        'include/corecg',
-        'corecg',
-        'sgl',
-        'picture',
-        '#..',
-    ],
+  CPPPATH = [
+    'include',
+    'include/corecg',
+    'corecg',
+    'sgl',
+    'picture',
+    '#..',
+  ],
 )
 
 env.Append(
-    CPPDEFINES = [
-        'SKIA_DISABLE_SUPPORT_FOR_DECODERS',
-    ],
+  CPPDEFINES = [
+    'SKIA_DISABLE_SUPPORT_FOR_DECODERS',
+  ],
+)
 
+if env['PLATFORM'] == 'win32':
+  env.Append(
     CCFLAGS = [
-        '/TP',
+      '/TP',
 
-        '/wd4244',
-        '/wd4267',
-        '/wd4345',
-        '/wd4390',
-        '/wd4554',
-        '/wd4800',
+      '/wd4244',
+      '/wd4267',
+      '/wd4345',
+      '/wd4390',
+      '/wd4554',
+      '/wd4800',
     ],
-)
+  )
 
 
 input_files = [
-    'animator/SkTime.cpp',
-    'corecg/Sk64.cpp',
-    'corecg/SkBuffer.cpp',
-    'corecg/SkChunkAlloc.cpp',
-    'corecg/SkCordic.cpp',
-    'corecg/SkDebug.cpp',
-    'corecg/SkDebug_stdio.cpp',
-    'corecg/SkFloat.cpp',
-    'corecg/SkInterpolator.cpp',
-    'corecg/SkMath.cpp',
-    'corecg/SkMatrix.cpp',
-    'corecg/SkMemory_stdlib.cpp',
-    'corecg/SkPoint.cpp',
-    'corecg/SkRect.cpp',
-    'corecg/SkRegion.cpp',
-    'effects/Sk1DPathEffect.cpp',
-    'effects/Sk2DPathEffect.cpp',
-    'effects/SkAvoidXfermode.cpp',
-    'effects/SkBlurDrawLooper.cpp',
-    'effects/SkBlurMask.cpp',
-    'effects/SkBlurMaskFilter.cpp',
-    'effects/SkCamera.cpp',
-    'effects/SkColorFilters.cpp',
-    'effects/SkColorMatrix.cpp',
-    'effects/SkColorMatrixFilter.cpp',
-    'effects/SkCornerPathEffect.cpp',
-    'effects/SkCullPoints.cpp',
-    'effects/SkDashPathEffect.cpp',
-    'effects/SkDiscretePathEffect.cpp',
-    'effects/SkEmbossMask.cpp',
-    'effects/SkEmbossMaskFilter.cpp',
-    'effects/SkGradientShader.cpp',
-    'effects/SkKernel33MaskFilter.cpp',
-    'effects/SkLayerRasterizer.cpp',
-    'effects/SkPaintFlagsDrawFilter.cpp',
-    'effects/SkPixelXorXfermode.cpp',
-    'effects/SkShaderExtras.cpp',
-    'effects/SkTransparentShader.cpp',
-    'effects/SkUnitMappers.cpp',
-    'images/SkImageDecoder.cpp',
-    'images/SkImageRef.cpp',
-    'images/SkStream.cpp',
-    'images/SkStream.cpp',
-    'picture/SkPictureFlat.cpp',
-    'picture/SkPicturePlayback.cpp',
-    'picture/SkPictureRecord.cpp',
-    'ports/SkFontHost_none.cpp',
-    'ports/SkGlobals_global.cpp',
-    'ports/SkImageDecoder_Factory.cpp',
-    'ports/SkOSFile_stdio.cpp',
-    'ports/SkThread_win.cpp',
-    'sgl/SkAlphaRuns.cpp',
-    'sgl/SkBitmap.cpp',
-    'sgl/SkBitmapProcShader.cpp',
-    'sgl/SkBitmapProcState.cpp',
-    'sgl/SkBitmapProcState_matrixProcs.cpp',
-    'sgl/SkBitmapSampler.cpp',
-    'sgl/SkBitmapShader.cpp',
-    'sgl/SkBlitRow_D16.cpp',
-    'sgl/SkBlitRow_D4444.cpp',
-    'sgl/SkBlitter.cpp',
-    'sgl/SkBlitter_4444.cpp',
-    'sgl/SkBlitter_A1.cpp',
-    'sgl/SkBlitter_A8.cpp',
-    'sgl/SkBlitter_ARGB32.cpp',
-    'sgl/SkBlitter_RGB16.cpp',
-    'sgl/SkBlitter_Sprite.cpp',
-    'sgl/SkCanvas.cpp',
-    'sgl/SkColor.cpp',
-    'sgl/SkColorFilter.cpp',
-    'sgl/SkColorTable.cpp',
-    'sgl/SkDeque.cpp',
-    'sgl/SkDevice.cpp',
-    'sgl/SkDither.cpp',
-    'sgl/SkDraw.cpp',
-    'sgl/SkEdge.cpp',
-    'sgl/SkFilterProc.cpp',
-    'sgl/SkFlattenable.cpp',
-    'sgl/SkGeometry.cpp',
-    'sgl/SkGlobals.cpp',
-    'sgl/SkGlyphCache.cpp',
-    'sgl/SkGraphics.cpp',
-    'sgl/SkMask.cpp',
-    'sgl/SkMaskFilter.cpp',
-    'sgl/SkPackBits.cpp',
-    'sgl/SkPaint.cpp',
-    'sgl/SkPath.cpp',
-    'sgl/SkPathEffect.cpp',
-    'sgl/SkPathMeasure.cpp',
-    'sgl/SkPicture.cpp',
-    'sgl/SkPixelRef.cpp',
-    'sgl/SkProcSpriteBlitter.cpp',
-    'sgl/SkPtrRecorder.cpp',
-    'sgl/SkRasterizer.cpp',
-    'sgl/SkRefCnt.cpp',
-    'sgl/SkRegion_path.cpp',
-    'sgl/SkScalerContext.cpp',
-    'sgl/SkScan.cpp',
-    'sgl/SkScan_Antihair.cpp',
-    'sgl/SkScan_AntiPath.cpp',
-    'sgl/SkScan_Hairline.cpp',
-    'sgl/SkScan_Path.cpp',
-    'sgl/SkShader.cpp',
-    'sgl/SkSpriteBlitter_ARGB32.cpp',
-    'sgl/SkSpriteBlitter_RGB16.cpp',
-    'sgl/SkString.cpp',
-    'sgl/SkStroke.cpp',
-    'sgl/SkStrokerPriv.cpp',
-    'sgl/SkTSearch.cpp',
-    'sgl/SkTypeface_fake.cpp',
-    'sgl/SkUtils.cpp',
-    'sgl/SkWriter32.cpp',
-    'sgl/SkXfermode.cpp',
+  'animator/SkTime.cpp',
+  'corecg/Sk64.cpp',
+  'corecg/SkBuffer.cpp',
+  'corecg/SkChunkAlloc.cpp',
+  'corecg/SkCordic.cpp',
+  'corecg/SkDebug.cpp',
+  'corecg/SkDebug_stdio.cpp',
+  'corecg/SkFloat.cpp',
+  'corecg/SkInterpolator.cpp',
+  'corecg/SkMath.cpp',
+  'corecg/SkMatrix.cpp',
+  'corecg/SkMemory_stdlib.cpp',
+  'corecg/SkPoint.cpp',
+  'corecg/SkRect.cpp',
+  'corecg/SkRegion.cpp',
+  'effects/Sk1DPathEffect.cpp',
+  'effects/Sk2DPathEffect.cpp',
+  'effects/SkAvoidXfermode.cpp',
+  'effects/SkBlurDrawLooper.cpp',
+  'effects/SkBlurMask.cpp',
+  'effects/SkBlurMaskFilter.cpp',
+  'effects/SkCamera.cpp',
+  'effects/SkColorFilters.cpp',
+  'effects/SkColorMatrix.cpp',
+  'effects/SkColorMatrixFilter.cpp',
+  'effects/SkCornerPathEffect.cpp',
+  'effects/SkCullPoints.cpp',
+  'effects/SkDashPathEffect.cpp',
+  'effects/SkDiscretePathEffect.cpp',
+  'effects/SkEmbossMask.cpp',
+  'effects/SkEmbossMaskFilter.cpp',
+  'effects/SkGradientShader.cpp',
+  'effects/SkKernel33MaskFilter.cpp',
+  'effects/SkLayerRasterizer.cpp',
+  'effects/SkPaintFlagsDrawFilter.cpp',
+  'effects/SkPixelXorXfermode.cpp',
+  'effects/SkShaderExtras.cpp',
+  'effects/SkTransparentShader.cpp',
+  'effects/SkUnitMappers.cpp',
+  'images/SkImageDecoder.cpp',
+  'images/SkImageRef.cpp',
+  'images/SkStream.cpp',
+  'images/SkStream.cpp',
+  'picture/SkPictureFlat.cpp',
+  'picture/SkPicturePlayback.cpp',
+  'picture/SkPictureRecord.cpp',
+  'ports/SkFontHost_none.cpp',
+  'ports/SkGlobals_global.cpp',
+  'ports/SkImageDecoder_Factory.cpp',
+  'ports/SkOSFile_stdio.cpp',
+  'sgl/SkAlphaRuns.cpp',
+  'sgl/SkBitmap.cpp',
+  'sgl/SkBitmapProcShader.cpp',
+  'sgl/SkBitmapProcState.cpp',
+  'sgl/SkBitmapProcState_matrixProcs.cpp',
+  'sgl/SkBitmapSampler.cpp',
+  'sgl/SkBitmapShader.cpp',
+  'sgl/SkBlitRow_D16.cpp',
+  'sgl/SkBlitRow_D4444.cpp',
+  'sgl/SkBlitter.cpp',
+  'sgl/SkBlitter_4444.cpp',
+  'sgl/SkBlitter_A1.cpp',
+  'sgl/SkBlitter_A8.cpp',
+  'sgl/SkBlitter_ARGB32.cpp',
+  'sgl/SkBlitter_RGB16.cpp',
+  'sgl/SkBlitter_Sprite.cpp',
+  'sgl/SkCanvas.cpp',
+  'sgl/SkColor.cpp',
+  'sgl/SkColorFilter.cpp',
+  'sgl/SkColorTable.cpp',
+  'sgl/SkDeque.cpp',
+  'sgl/SkDevice.cpp',
+  'sgl/SkDither.cpp',
+  'sgl/SkDraw.cpp',
+  'sgl/SkEdge.cpp',
+  'sgl/SkFilterProc.cpp',
+  'sgl/SkFlattenable.cpp',
+  'sgl/SkGeometry.cpp',
+  'sgl/SkGlobals.cpp',
+  'sgl/SkGlyphCache.cpp',
+  'sgl/SkGraphics.cpp',
+  'sgl/SkMask.cpp',
+  'sgl/SkMaskFilter.cpp',
+  'sgl/SkPackBits.cpp',
+  'sgl/SkPaint.cpp',
+  'sgl/SkPath.cpp',
+  'sgl/SkPathEffect.cpp',
+  'sgl/SkPathMeasure.cpp',
+  'sgl/SkPicture.cpp',
+  'sgl/SkPixelRef.cpp',
+  'sgl/SkProcSpriteBlitter.cpp',
+  'sgl/SkPtrRecorder.cpp',
+  'sgl/SkRasterizer.cpp',
+  'sgl/SkRefCnt.cpp',
+  'sgl/SkRegion_path.cpp',
+  'sgl/SkScalerContext.cpp',
+  'sgl/SkScan.cpp',
+  'sgl/SkScan_Antihair.cpp',
+  'sgl/SkScan_AntiPath.cpp',
+  'sgl/SkScan_Hairline.cpp',
+  'sgl/SkScan_Path.cpp',
+  'sgl/SkShader.cpp',
+  'sgl/SkSpriteBlitter_ARGB32.cpp',
+  'sgl/SkSpriteBlitter_RGB16.cpp',
+  'sgl/SkString.cpp',
+  'sgl/SkStroke.cpp',
+  'sgl/SkStrokerPriv.cpp',
+  'sgl/SkTSearch.cpp',
+  'sgl/SkTypeface_fake.cpp',
+  'sgl/SkUtils.cpp',
+  'sgl/SkWriter32.cpp',
+  'sgl/SkXfermode.cpp',
 ]
 
-env_p = env.Clone(
+if env['PLATFORM'] in ('darwin', 'posix'):
+  input_files.append('ports/SkThread_pthread.cpp')
+
+if env['PLATFORM'] == 'win32':
+  input_files.append('ports/SkThread_win.cpp')
+
+  env_p = env.Clone(
     PCHSTOP = 'SkTypes.h',
     PDB = 'vc80.pdb',
-)
+  )
 
-# TODO(rspangler): This step forces -Zi, but doesn't actually use it.  Need to
-# fix so it doesn't override our -Z7.  -Zi also causes vc80.pdb to be created
-# in the skia directory.
-# TODO(bradnelson): This step creates a skia.pch.ib_tag file to be created. 
-# It's a 0-length file so likely harmless.  Is this a side effect of having
-# IncrediBuild installed on the build machine?
-pch, obj = env_p.PCH(['skia.pch', 'precompiled.obj'], 'precompiled.cc')
-env_p['PCH'] = pch
+  # TODO(rspangler): This step forces -Zi, but doesn't actually use it.  Need to
+  # fix so it doesn't override our -Z7.  -Zi also causes vc80.pdb to be created
+  # in the skia directory.
+  # TODO(bradnelson): This step creates a skia.pch.ib_tag file to be created. 
+  # It's a 0-length file so likely harmless.  Is this a side effect of having
+  # IncrediBuild installed on the build machine?
+  pch, obj = env_p.PCH(['skia.pch', 'precompiled.obj'], 'precompiled.cc')
+  env_p['PCH'] = pch
+  input_files += [obj]
 
-env.ChromeStaticLibrary('skia', input_files + [obj])
+env.ChromeStaticLibrary('skia', input_files)