diff options
| author | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-17 14:40:29 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-17 14:40:29 +0000 |
| commit | 37f658733f26e4ad0e19b2dfb3642350b33df5d4 (patch) | |
| tree | 02f3249b94b7930bca9d3191fe1cca3a02e44694 | |
| parent | 3824512f1312ec4260ad0b8bf372619c7168ef6b (diff) | |
| download | chromium_src-37f658733f26e4ad0e19b2dfb3642350b33df5d4.zip chromium_src-37f658733f26e4ad0e19b2dfb3642350b33df5d4.tar.gz chromium_src-37f658733f26e4ad0e19b2dfb3642350b33df5d4.tar.bz2 | |
Roll Skia DEPS to r12698
R=rmistry@google.com
Review URL: https://codereview.chromium.org/98503008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241277 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 4 | ||||
| -rw-r--r-- | skia/skia_test_expectations.txt | 5 |
2 files changed, 7 insertions, 2 deletions
@@ -41,8 +41,8 @@ vars = { "sfntly_revision": "228", "lighttpd_revision": "33737", - "skia_revision": "12678", - "skia_hash": "e132f5031fb700e34af1ea08b575b2c774393047", + "skia_revision": "12698", + "skia_hash": "79b7eeebdff3bfae8a517dc2e4763bc2c7f81557", # 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 3272ffb..520a8be 100644 --- a/skia/skia_test_expectations.txt +++ b/skia/skia_test_expectations.txt @@ -57,4 +57,9 @@ crbug.com/326138 virtual/gpu/fast/canvas/canvas-composite.html [ ImageOnlyFailur crbug.com/326138 virtual/gpu/fast/canvas/image-object-in-canvas.html [ ImageOnlyFailure ] crbug.com/326138 virtual/gpu/fast/canvas/quadraticCurveTo.xml [ ImageOnlyFailure ] +# the Skia roll to r12698 caused imperceptible diffs in the following tests: +crbug.com/329201 svg/W3C-SVG-1.1/filters-example-01-b.svg [ ImageOnlyFailure ] +crbug.com/329201 svg/as-background-image/svg-as-background-6.html [ ImageOnlyFailure ] +crbug.com/329201 svg/text/text-path-01-b.svg [ ImageOnlyFailure ] + # END OVERRIDES HERE (this line ensures that the file is newline-terminated) |