Roll Skia DEPS to r6641 & add suppressions

control: https://codereview.chromium.org/11418289/
Review URL: https://codereview.chromium.org/11412301

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

3 files changed, 3 insertions, 72 deletions

diff --git a/DEPS b/DEPS
index 75da575..9e54fdb 100644
--- a/DEPS
+++ b/DEPS
@@ -29,7 +29,7 @@ vars = {
   "ffmpeg_hash": "82ae69cc47f25f9a59cf2ca8742e3391c34e7602",
 
   "sfntly_revision": "134",
-  "skia_revision": "6630",
+  "skia_revision": "6641",
   # 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.gyp b/skia/skia.gyp
index 0decae1..ea8cf99 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -232,10 +232,6 @@
         # the few failures are a bug or not.
         'SK_SUPPORT_INT_SRCRECT_DRAWBITMAPRECT',
         
-        # Moved from SkUserConfig.h, so we can rebaseline when we remove this.
-        'SK_DISABLE_DITHER_32BIT_GRADIENT',
-
-        'SK_DISABLE_DASHING_OPTIMIZATION',
         'SK_DISABLE_SEPARABLE_MASK_BLUR',
       ],
       'sources!': [
diff --git a/skia/skia_test_expectations.txt b/skia/skia_test_expectations.txt
index dc28478..b7382d3 100644
--- a/skia/skia_test_expectations.txt
+++ b/skia/skia_test_expectations.txt
@@ -51,76 +51,11 @@
 # bungeman@ will rebaseline this test
 crbug.com/155867 platform/chromium-linux/fast/text/chromium-linux-fontconfig-renderstyle.html [ Failure ImageOnlyFailure ]
 
-# To be rebaselined after skia.gyp undefines SK_DISABLE_EXTRACTSUBSET_OPAQUE_FIX
-#
-crbug.com/156097  fast/backgrounds/repeat/negative-offset-repeat-transformed.html [ ImageOnlyFailure ] 
-crbug.com/156097  fast/borders/border-image-rotate-transform.html [ ImageOnlyFailure ] 
-crbug.com/156097  svg/custom/clip-mask-negative-scale.svg [ ImageOnlyFailure ] 
-crbug.com/156097  svg/custom/focus-ring.svg [ ImageOnlyFailure ] 
-crbug.com/156097  svg/transforms/animated-path-inside-transformed-html.xhtml [ ImageOnlyFailure ] 
-crbug.com/156097  fast/forms/select-style.html [ ImageOnlyFailure ] 
-
-# To be rebaselined by reed@. http://code.google.com/p/skia/source/detail?r=6220
-# removed double drawing of clipped hairlines at edges.
-
-crbug.com/148638  fast/repaint/list-marker.html [ Failure ImageOnlyFailure ]
-crbug.com/148638  svg/hixie/perf/001.xml [ Failure ImageOnlyFailure ]
-crbug.com/148638  svg/hixie/perf/002.xml [ Failure ImageOnlyFailure ]
-crbug.com/148638  svg/transforms/text-with-pattern-inside-transformed-html.xhtml [ Failure ImageOnlyFailure ]
-crbug.com/148638  svg/zoom/page/zoom-img-preserveAspectRatio-support-1.html [ Failure ImageOnlyFailure ]
-
-
 # To be rebaselined for http://code.google.com/p/skia/source/detail?r=6451
 # (make kSrc_Mode go faster)
-crbug.com/161762  svg/W3C-SVG-1.1/filters-color-01-b.svg [ Failure ImageOnlyFailure ]
-crbug.com/161762  svg/custom/gradient-stop-corner-cases.svg [ Crash ImageOnlyFailure ]
-crbug.com/161762  svg/custom/invalid-uri-stroke.svg [ Failure ImageOnlyFailure ]
-crbug.com/161762  svg/wicd/test-scalable-background-image1.xhtml [ Failure ImageOnlyFailure ]
-crbug.com/161762  svg/zoom/page/zoom-mask-with-percentages.svg [ Failure ImageOnlyFailure ]
 crbug.com/161762  svg/carto.net/colourpicker.svg [ Crash ImageOnlyFailure ]
 
-# To be rebaselined for https://code.google.com/p/skia/source/detail?r=6483
-crbug.com/161899  compositing/shadows/shadow-drawing.html [ Failure ImageOnlyFailure ]
-crbug.com/161899  fast/box-shadow/basic-shadows.html [ Failure ImageOnlyFailure ]
-crbug.com/161899  fast/box-shadow/box-shadow-clipped-slices.html [ Failure ImageOnlyFailure ]
-crbug.com/161899  fast/box-shadow/box-shadow-radius.html [ Failure ImageOnlyFailure ]
-crbug.com/161899  fast/box-shadow/box-shadow-transformed.html [ Failure ImageOnlyFailure ]
-crbug.com/161899  fast/box-shadow/inset-box-shadow-radius.html [ Failure ImageOnlyFailure ]
-crbug.com/161899  fast/box-shadow/inset-box-shadows.html [ Failure ImageOnlyFailure ]
-crbug.com/161899  fast/box-shadow/inset.html [ Failure ImageOnlyFailure ]
-crbug.com/161899  fast/box-shadow/scaled-box-shadow.html [ Failure ImageOnlyFailure ]
-crbug.com/161899  fast/box-shadow/single-pixel-shadow.html [ Failure ImageOnlyFailure ]
-crbug.com/161899  fast/repaint/box-shadow-h.html [ Failure ImageOnlyFailure ]
-crbug.com/161899  fast/repaint/box-shadow-v.html [ Failure ImageOnlyFailure ]
-crbug.com/161899  fast/repaint/shadow-multiple-vertical.html [ Failure ImageOnlyFailure ]
-crbug.com/161899  fast/repaint/transform-replaced-shadows.html [ Failure ImageOnlyFailure ]
-crbug.com/161899  fast/transforms/shadows.html [ Failure ImageOnlyFailure ]
-crbug.com/161899  platform/chromium/fast/forms/calendar-picker/calendar-picker-appearance-ru.html [ Failure ImageOnlyFailure ]
-crbug.com/161899  platform/chromium/fast/forms/calendar-picker/calendar-picker-appearance-step.html [ Failure ImageOnlyFailure ]
-crbug.com/161899  platform/chromium/fast/forms/calendar-picker/calendar-picker-appearance.html [ Failure ImageOnlyFailure ]
-crbug.com/161899  platform/chromium/fast/forms/calendar-picker/month-picker-appearance-step.html [ Failure ImageOnlyFailure ]
-crbug.com/161899  platform/chromium/fast/forms/calendar-picker/month-picker-appearance.html [ Failure ImageOnlyFailure ]
-crbug.com/161899  platform/chromium/fast/forms/calendar-picker/week-picker-appearance-step.html [ Failure ImageOnlyFailure ]
-crbug.com/161899  platform/chromium/fast/forms/calendar-picker/week-picker-appearance.html [ Failure ImageOnlyFailure ]
-crbug.com/161899  platform/chromium/fast/forms/color/color-suggestion-picker-appearance.html [ Failure ImageOnlyFailure ]
-crbug.com/161899  platform/chromium/fast/forms/color/color-suggestion-picker-one-row-appearance.html [ Failure ImageOnlyFailure ]
-crbug.com/161899  platform/chromium/fast/forms/color/color-suggestion-picker-two-row-appearance.html [ Failure ImageOnlyFailure ]
-crbug.com/161899  platform/chromium/fast/forms/color/color-suggestion-picker-with-scrollbar-appearance.html [ Failure ImageOnlyFailure ]
-crbug.com/161899  platform/chromium/virtual/softwarecompositing/shadows/shadow-drawing.html [ Failure ImageOnlyFailure ]
-crbug.com/161899  svg/filters/shadow-on-rect-with-filter.svg [ Failure ImageOnlyFailure ]
-
-# To be rebaselined after skia rev. 6530 has landed in webkit
-crbug.com/162247  fast/canvas/canvas-incremental-repaint.html [ ImageOnlyFailure ]
-crbug.com/162247  svg/W3C-SVG-1.1/animate-elem-81-t.svg [ ImageOnlyFailure ]
-crbug.com/162247  svg/W3C-SVG-1.1/animate-elem-82-t.svg [ ImageOnlyFailure ]
-crbug.com/162247  svg/W3C-SVG-1.1/painting-stroke-02-t.svg [ ImageOnlyFailure ]
-crbug.com/162247  svg/css/group-with-shadow.svg [ ImageOnlyFailure ]
-crbug.com/162247  svg/custom/linking-a-03-b-transform.svg [ ImageOnlyFailure ]
-crbug.com/162247  svg/custom/linking-a-03-b-viewBox-transform.svg [ ImageOnlyFailure ]
-crbug.com/162247  svg/custom/pattern-rotate.svg [ ImageOnlyFailure ]
-crbug.com/162247  svg/custom/stroke-width-large.svg [ ImageOnlyFailure ]
-crbug.com/162247  svg/custom/use-transform.svg [ ImageOnlyFailure ]
-crbug.com/162247  svg/transforms/text-with-pattern-with-svg-transform.svg [ ImageOnlyFailure ]
-
+# To be rebaselined for https://code.google.com/p/skia/source/detail?r=6483 
+crbug.com/161899 platform/chromium/virtual/softwarecompositing/shadows/shadow-drawing.html [ Failure ImageOnlyFailure ]
 
 # END OVERRIDES HERE (this line ensures that the file is newline-terminated)