Roll Skia DEPS to r13390

R=reed@google.com Review URL: https://codereview.chromium.org/155683003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250423 0039d316-1c4b-4281-b951-d872f2087c98
hylschwy · Feb 11, 2014 · e8afa45 · e8afa45
1 parent 88c5700
commit e8afa45
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/DEPS b/DEPS
@@ -45,8 +45,8 @@ vars = {
 
   "sfntly_revision": "228",
   "lighttpd_revision": "33737",
-  "skia_revision": "13378",
-  "skia_hash": "2693eb95233f16ed58b7b37c6b497fb8991b0396",
+  "skia_revision": "13390",
+  "skia_hash": "7e90e8dbb96f2084f7dd4a6a20cb4b880b362438",
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling Skia
   # and V8 without interference from each other.

diff --git a/skia/ext/analysis_canvas_unittest.cc b/skia/ext/analysis_canvas_unittest.cc
@@ -108,7 +108,8 @@ TEST(AnalysisCanvasTest, ComplexActions) {
   // Draw bitmap test.
   SolidColorFill(canvas);
   SkBitmap secondBitmap;
-  secondBitmap.setConfig(SkBitmap::kNo_Config, 255, 255);
+  secondBitmap.setConfig(SkBitmap::kARGB_8888_Config, 255, 255);
+  secondBitmap.allocPixels();
   canvas.drawBitmap(secondBitmap, 0, 0);
 
   EXPECT_FALSE(canvas.GetColorIfSolid(&outputColor));

diff --git a/skia/skia_library_opts.gyp b/skia/skia_library_opts.gyp
@@ -119,7 +119,9 @@
             '../third_party/skia/src/opts/SkBlitMask_opts_arm.cpp',
             '../third_party/skia/src/opts/SkBlitRow_opts_arm.cpp',
             '../third_party/skia/src/opts/SkBlitRow_opts_arm.h',
-            '../third_party/skia/src/opts/opts_check_arm.cpp',
+            '../third_party/skia/src/opts/SkBlurImage_opts_arm.cpp',
+            '../third_party/skia/src/opts/SkMorphology_opts_arm.cpp',
+            '../third_party/skia/src/opts/SkUtils_opts_arm.cpp',
             '../third_party/skia/src/opts/SkXfermode_opts_none.cpp',
           ],
         }],