From 653922c1480796417fb8c9c00865610f66544ed0 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Wed, 21 Nov 2012 19:35:37 +0000 Subject: roll skia to 6530 Review URL: https://codereview.chromium.org/11414115 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169091 0039d316-1c4b-4281-b951-d872f2087c98 --- skia/skia.gyp | 1 - skia/skia_test_expectations.txt | 13 +++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'skia') diff --git a/skia/skia.gyp b/skia/skia.gyp index 37bfe42..aa02390 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -218,7 +218,6 @@ 'GR_STATIC_RECT_VB=1', 'GR_AGGRESSIVE_SHADER_OPTS=1', 'SK_DEFERRED_CANVAS_USES_GPIPE=1', - 'SK_IGNORE_NEW_STROKERECT', # this flag can be removed entirely once this has baked for a while 'SK_ALLOW_OVER_32K_BITMAPS', diff --git a/skia/skia_test_expectations.txt b/skia/skia_test_expectations.txt index a3d8873..97fa9a9 100644 --- a/skia/skia_test_expectations.txt +++ b/skia/skia_test_expectations.txt @@ -107,5 +107,18 @@ crbug.com/161899 platform/chromium/fast/forms/color/color-suggestion-picker-wit 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 ] + # END OVERRIDES HERE (this line ensures that the file is newline-terminated) -- cgit v1.1