Roll Skia DEPS to 11409 with suppressions

R=bsalomon@google.com Review URL: https://codereview.chromium.org/24258007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224374 0039d316-1c4b-4281-b951-d872f2087c98
marcosholgado · Sep 20, 2013 · c93fe3e · c93fe3e
1 parent 5a70f7a
commit c93fe3e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/DEPS b/DEPS
@@ -29,8 +29,8 @@ vars = {
   "ffmpeg_hash": "feb5bc7d3d1fc66d9c52dc316479231b02cbdac1",
 
   "sfntly_revision": "134",
-  "skia_revision": "11364",
-  "skia_hash": "8249a2fc66738fd4aeb2500aae50c20744f1a744",
+  "skia_revision": "11409",
+  "skia_hash": "dfbd99e101ae9dd0dbeda7e4736d3d205f723834",
   # 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/skia_library.gypi b/skia/skia_library.gypi
@@ -52,7 +52,6 @@
         'default_font_cache_limit': '(1*1024*1024)',
         'skia_export_defines': [
           'SK_BUILD_FOR_ANDROID',
-          'USE_CHROMIUM_SKIA',
         ],
       }],
     ],

diff --git a/skia/skia_test_expectations.txt b/skia/skia_test_expectations.txt
@@ -63,4 +63,9 @@ crbug.com/292656 css3/filters/effect-reference-colorspace-hw.html [ ImageOnlyFai
 crbug.com/292656 css3/filters/effect-reference-hw.html [ ImageOnlyFailure ]
 crbug.com/292656 css3/filters/effect-reference-subregion-hw.html [ ImageOnlyFailure ]
 
+# Skia r11365 slightly changed how the GPU draws lines
+crbug.com/295579 virtual/gpu/fast/canvas/canvas-text-baseline.html [ ImageOnlyFailure ]
+crbug.com/295579 virtual/gpu/fast/canvas/canvas-transforms-during-path.html [ ImageOnlyFailure ]
+crbug.com/295579 virtual/gpu/fast/canvas/quadraticCurveTo.xml [ ImageOnlyFailure ]
+
 # END OVERRIDES HERE (this line ensures that the file is newline-terminated)