From 37815483c9d48aec7c54b6897e5f18c40c5f6145 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Tue, 27 Nov 2012 16:52:19 +0000 Subject: Roll Skia DEPS to 6555 & suppress colourpicker.svg & gradient-stop-corner-cases.svg layout tests (take 2) control: https://codereview.chromium.org/11418180/ This roll is base on an earlier attempt (https://codereview.chromium.org/11299189/) Review URL: https://codereview.chromium.org/11316188 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169667 0039d316-1c4b-4281-b951-d872f2087c98 --- DEPS | 2 +- skia/skia_test_expectations.txt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/DEPS b/DEPS index bc363f4..7cf30b7 100644 --- a/DEPS +++ b/DEPS @@ -29,7 +29,7 @@ vars = { "ffmpeg_hash": "82ae69cc47f25f9a59cf2ca8742e3391c34e7602", "sfntly_revision": "134", - "skia_revision": "6533", + "skia_revision": "6555", # 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_test_expectations.txt b/skia/skia_test_expectations.txt index 97fa9a9..dc28478 100644 --- a/skia/skia_test_expectations.txt +++ b/skia/skia_test_expectations.txt @@ -73,9 +73,11 @@ crbug.com/148638 svg/zoom/page/zoom-img-preserveAspectRatio-support-1.html [ Fa # 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 ] -- cgit v1.1