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

skia/skia.gyp

Index: skia/skia.gyp
===================================================================
--- skia/skia.gyp	(revision 68621)
+++ skia/skia.gyp	(working copy)
@@ -343,8 +343,8 @@
         #'../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',
@@ -745,6 +745,20 @@
         }],
       ],
     },
+    {
+      'target_name': 'image_operations_bench',
+      'type': 'executable',
+      'dependencies': [
+        '../base/base.gyp:base',
+        'skia',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+        'ext/image_operations_bench.cc',
+      ],
+    },
   ],
 }