diff options
| author | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-20 15:40:14 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-20 15:40:14 +0000 |
| commit | 7e30523cd0476aa59e01c1a758e77ee70517cd45 (patch) | |
| tree | 2947bace8113cb7695a142cb97897678804f2102 /skia | |
| parent | 38ef36f44826408184e19a00fbba560a498d4677 (diff) | |
| download | chromium_src-7e30523cd0476aa59e01c1a758e77ee70517cd45.zip chromium_src-7e30523cd0476aa59e01c1a758e77ee70517cd45.tar.gz chromium_src-7e30523cd0476aa59e01c1a758e77ee70517cd45.tar.bz2 | |
Roll Skia DEPS to r9694
R=reed@google.com
Review URL: https://codereview.chromium.org/17484003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207440 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/skia.gyp | 3 | ||||
| -rw-r--r-- | skia/skia_test_expectations.txt | 26 |
2 files changed, 27 insertions, 2 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index d55a113..e806d2c 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -261,8 +261,7 @@ '../third_party/skia/gyp/gpu.gypi', ], 'sources': [ - '<@(gr_sources)', - '<@(skgr_sources)', + '<@(skgpu_sources)', ], 'include_dirs': [ '../third_party/skia/include/gpu', diff --git a/skia/skia_test_expectations.txt b/skia/skia_test_expectations.txt index eb7f1da..0e17447 100644 --- a/skia/skia_test_expectations.txt +++ b/skia/skia_test_expectations.txt @@ -58,4 +58,30 @@ crbug.com/243726 svg/as-background-image/svg-as-background-6.html [ ImageOnlyFai crbug.com/247306 svg/custom/use-referencing-nonexisting-symbol.svg [ Failure ImageOnlyFailure ] crbug.com/247306 [ Linux ] fast/text/international/spaces-combined-in-vertical-text.html [ Failure ] +# With the Skia DEPS roll to r9631 (https://codereview.chromium.org/17078006/) +# some layout test images changed. This is most likely due to r9605 +# (https://code.google.com/p/skia/source/detail?r=9605) +crbug.com/250525 css3/filters/custom/custom-filter-nonseparable-blend-mode-color.html [ ImageOnlyFailure Crash ] +crbug.com/250525 css3/filters/custom/custom-filter-nonseparable-blend-mode-hue.html [ ImageOnlyFailure Crash ] +crbug.com/250525 css3/filters/custom/custom-filter-nonseparable-blend-mode-luminosity.html [ ImageOnlyFailure Crash ] +crbug.com/250525 css3/filters/custom/custom-filter-nonseparable-blend-mode-saturation.html [ ImageOnlyFailure Crash ] +crbug.com/250525 svg/W3C-SVG-1.1/masking-intro-01-f.svg [ ImageOnlyFailure ] +crbug.com/250525 svg/css/circle-in-mask-with-shadow.svg [ ImageOnlyFailure ] +crbug.com/250525 svg/custom/grayscale-gradient-mask-2.svg [ ImageOnlyFailure ] +crbug.com/250525 svg/custom/mask-colorspace.svg [ ImageOnlyFailure ] +crbug.com/250525 svg/dynamic-updates/SVGFETurbulenceElement-dom-baseFrequency-attr.html [ ImageOnlyFailure ] +crbug.com/250525 svg/dynamic-updates/SVGFETurbulenceElement-dom-numOctaves-attr.html [ ImageOnlyFailure ] +crbug.com/250525 svg/dynamic-updates/SVGFETurbulenceElement-dom-seed-attr.html [ ImageOnlyFailure ] +crbug.com/250525 svg/dynamic-updates/SVGFETurbulenceElement-dom-stitchTiles-attr.html [ ImageOnlyFailure ] +crbug.com/250525 svg/dynamic-updates/SVGFETurbulenceElement-dom-type-attr.html [ ImageOnlyFailure ] +crbug.com/250525 svg/dynamic-updates/SVGFETurbulenceElement-svgdom-baseFrequency-prop.html [ ImageOnlyFailure ] +crbug.com/250525 svg/dynamic-updates/SVGFETurbulenceElement-svgdom-numOctaves-prop.html [ ImageOnlyFailure ] +crbug.com/250525 svg/dynamic-updates/SVGFETurbulenceElement-svgdom-seed-prop.html [ ImageOnlyFailure ] +crbug.com/250525 svg/dynamic-updates/SVGFETurbulenceElement-svgdom-stitchTiles-prop.html [ ImageOnlyFailure ] +crbug.com/250525 svg/dynamic-updates/SVGFETurbulenceElement-svgdom-type-prop.html [ ImageOnlyFailure ] +crbug.com/250525 svg/filters/filter-clip.svg [ ImageOnlyFailure ] +crbug.com/250525 css3/filters/effect-reference.html [ ImageOnlyFailure ] +crbug.com/250525 svg/W3C-SVG-1.1/filters-turb-01-f.svg [ ImageOnlyFailure ] +crbug.com/250525 svg/W3C-SVG-1.1/filters-turb-02-f.svg [ ImageOnlyFailure ] + # END OVERRIDES HERE (this line ensures that the file is newline-terminated) |