Roll Skia DEPS to r12208

R=reed@google.com

Review URL: https://codereview.chromium.org/68063002

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

DEPS

@@ -44,8 +44,8 @@ vars = {
 
   "sfntly_revision": "228",
   "lighttpd_revision": "33737",
-  "skia_revision": "12182",
-  "skia_hash": "f3db546a4bf1717126a7ba4dd47ece077a6e76f7",
+  "skia_revision": "12208",
+  "skia_hash": "ed000840d4e56336858752994bad5d491e4ed4a5",
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling Skia
   # and V8 without interference from each other.

skia/skia_library_opts.gyp

@@ -51,6 +51,7 @@
             '../third_party/skia/src/opts/SkXfermode_opts_none.cpp',
             '../third_party/skia/src/opts/SkBitmapFilter_opts_SSE2.cpp',
             '../third_party/skia/src/opts/SkMorphology_opts_SSE2.cpp',
+            '../third_party/skia/src/opts/SkBlurImage_opts_SSE2.cpp',
           ],
           'dependencies': [
             'skia_opts_ssse3',
@@ -109,6 +110,7 @@
             '../third_party/skia/src/opts/SkUtils_opts_none.cpp',
             '../third_party/skia/src/opts/SkXfermode_opts_none.cpp',
             '../third_party/skia/src/opts/SkMorphology_opts_none.cpp',
+            '../third_party/skia/src/opts/SkBlurImage_opts_none.cpp',
           ],
         }],
         [ 'target_arch == "arm" and arm_version >= 6', {
@@ -119,6 +121,7 @@
             '../third_party/skia/src/opts/opts_check_arm.cpp',
             '../third_party/skia/src/opts/SkXfermode_opts_none.cpp',
             '../third_party/skia/src/opts/SkMorphology_opts_none.cpp',
+            '../third_party/skia/src/opts/SkBlurImage_opts_none.cpp',
           ],
         }],
         [ 'target_arch == "mipsel"',{
@@ -132,6 +135,7 @@
             '../third_party/skia/src/opts/SkUtils_opts_none.cpp',
             '../third_party/skia/src/opts/SkXfermode_opts_none.cpp',
             '../third_party/skia/src/opts/SkMorphology_opts_none.cpp',
+            '../third_party/skia/src/opts/SkBlurImage_opts_none.cpp',
           ],
         }],
       ],
@@ -195,6 +199,7 @@
         '../third_party/skia/src/opts/SkUtils_opts_none.cpp',
         '../third_party/skia/src/opts/SkXfermode_opts_none.cpp',
         '../third_party/skia/src/opts/SkMorphology_opts_none.cpp',
+        '../third_party/skia/src/opts/SkBlurImage_opts_none.cpp',
       ],
     },
   ],

skia/skia_test_expectations.txt

@@ -51,4 +51,19 @@
 # the Skia roll to 12018 again altered the way roundrects are drawn
 crbug.com/314499 fast/canvas/image-object-in-canvas.html [ ImageOnlyFailure ]
 
+# The roll to Skia r12208 introduce minor image differences in the following
+# layout tests. These changes are due to: Skia r12198 Add ability to ninepatch 
+# blurred rounded rectangle https://codereview.chromium.org/48623006
+crbug.com/317658 fast/box-shadow/basic-shadows.html [ ImageOnlyFailure ]
+crbug.com/317658 fast/box-shadow/box-shadow-clipped-slices.html [ ImageOnlyFailure ]
+crbug.com/317658 fast/box-shadow/shadow-tiling-artifact.html [ ImageOnlyFailure ]
+crbug.com/317658 fast/css/shadow-multiple.html [ ImageOnlyFailure ]
+crbug.com/317658 fast/repaint/shadow-multiple-horizontal.html [ ImageOnlyFailure ]
+crbug.com/317658 fast/repaint/shadow-multiple-strict-horizontal.html [ ImageOnlyFailure ]
+crbug.com/317658 fast/repaint/shadow-multiple-strict-vertical.html [ ImageOnlyFailure ]
+crbug.com/317658 fast/repaint/shadow-multiple-vertical.html [ ImageOnlyFailure ]
+crbug.com/317658 fast/writing-mode/box-shadow-horizontal-bt.html [ ImageOnlyFailure ]
+crbug.com/317658 fast/writing-mode/box-shadow-vertical-lr.html [ ImageOnlyFailure ]
+crbug.com/317658 fast/writing-mode/box-shadow-vertical-rl.html [ ImageOnlyFailure ]
+
 # END OVERRIDES HERE (this line ensures that the file is newline-terminated)