Integration of most changes from the GoogleTV project around the convolver/sc...

skia/skia.gyp

-# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+# Copyright (c) 2011 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.
 
 {
   'targets': [
     {
       'target_name': 'skia',
       'type': '<(library)',
       'msvs_guid': 'CD9CA56E-4E94-444C-87D4-58CA1E6F300D',
       'sources': [
@@ skipping 326 matching lines @@
         '../third_party/skia/src/images/SkImageDecoder.cpp',
         '../third_party/skia/src/images/SkImageDecoder_Factory.cpp',
         #'../third_party/skia/src/images/SkImageDecoder_fpdfemb.cpp',
         #'../third_party/skia/src/images/SkImageDecoder_libbmp.cpp',
         #'../third_party/skia/src/images/SkImageDecoder_libgif.cpp',
         #'../third_party/skia/src/images/SkImageDecoder_libico.cpp',
         #'../third_party/skia/src/images/SkImageDecoder_libjpeg.cpp',
         #'../third_party/skia/src/images/SkImageDecoder_libpng.cpp',
         #'../third_party/skia/src/images/SkImageDecoder_libpvjpeg.cpp',
         #'../third_party/skia/src/images/SkImageDecoder_wbmp.cpp',
-        #'../third_party/skia/src/images/SKImageEncoder.cpp',
-        #'../third_party/skia/src/images/SKImageEncoder_Factory.cpp',
+        #'../third_party/skia/src/images/SkImageEncoder.cpp',
+        #'../third_party/skia/src/images/SkImageEncoder_Factory.cpp',
         #'../third_party/skia/src/images/SkImageRef.cpp',
         #'../third_party/skia/src/images/SkImageRefPool.cpp',
         #'../third_party/skia/src/images/SkImageRefPool.h',
         #'../third_party/skia/src/images/SkImageRef_GlobalPool.cpp',
         #'../third_party/skia/src/images/SkMovie.cpp',
         #'../third_party/skia/src/images/SkMovie_gif.cpp',
         '../third_party/skia/src/images/SkScaledBitmapSampler.cpp',
         '../third_party/skia/src/images/SkScaledBitmapSampler.h',
 
         '../third_party/skia/src/opts/opts_check_SSE2.cpp',
@@ skipping 373 matching lines @@
             '-fomit-frame-pointer',
           ],
           'sources': [
             '../third_party/skia/src/opts/SkBitmapProcState_opts_arm.cpp',
             '../third_party/skia/src/opts/SkBlitRow_opts_arm.cpp',
             '../third_party/skia/src/opts/SkUtils_opts_none.cpp',
           ],
         }],
       ],
     },
+    {
+      'target_name': 'image_operations_bench',
+      'type': 'executable',
+      'dependencies': [
+        '../base/base.gyp:base',
+        'skia',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+        'ext/image_operations_bench.cc',
+      ],
+    },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: