diff options
| author | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-05 14:13:34 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-05 14:13:34 +0000 |
| commit | 22ad69df3e5faf8c8f29668150d9c6ee7dcbd3f7 (patch) | |
| tree | 6a2875585d0dd1a7c7f854fc04f1d80d5536cfa6 /skia | |
| parent | db00d2df30fff6ad5c1a73282dfe1b6b32bccdc9 (diff) | |
| download | chromium_src-22ad69df3e5faf8c8f29668150d9c6ee7dcbd3f7.zip chromium_src-22ad69df3e5faf8c8f29668150d9c6ee7dcbd3f7.tar.gz chromium_src-22ad69df3e5faf8c8f29668150d9c6ee7dcbd3f7.tar.bz2 | |
Roll Skia DEPS to r12494
R=reed@google.com
Review URL: https://codereview.chromium.org/93933007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238966 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/skia_library_opts.gyp | 2 | ||||
| -rw-r--r-- | skia/skia_test_expectations.txt | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/skia/skia_library_opts.gyp b/skia/skia_library_opts.gyp index 0321d07..5e93c6d 100644 --- a/skia/skia_library_opts.gyp +++ b/skia/skia_library_opts.gyp @@ -120,7 +120,6 @@ '../third_party/skia/src/opts/SkBlitRow_opts_arm.h', '../third_party/skia/src/opts/opts_check_arm.cpp', '../third_party/skia/src/opts/SkXfermode_opts_none.cpp', - '../third_party/skia/src/opts/SkBlurImage_opts_none.cpp', ], }], [ 'target_arch == "mipsel"',{ @@ -244,6 +243,7 @@ '../third_party/skia/src/opts/SkBlitMask_opts_arm_neon.cpp', '../third_party/skia/src/opts/SkBlitRow_opts_arm_neon.cpp', '../third_party/skia/src/opts/SkXfermode_opts_arm_neon.cpp', + '../third_party/skia/src/opts/SkBlurImage_opts_neon.cpp', '../third_party/skia/src/opts/SkMorphology_opts_neon.cpp', ], 'conditions': [ diff --git a/skia/skia_test_expectations.txt b/skia/skia_test_expectations.txt index 3229256..3272ffb 100644 --- a/skia/skia_test_expectations.txt +++ b/skia/skia_test_expectations.txt @@ -51,4 +51,10 @@ # the Skia roll to 12018 again altered the way roundrects are drawn crbug.com/314499 fast/canvas/image-object-in-canvas.html [ ImageOnlyFailure ] +# the Skia roll to r12494 altered convex path rendering on the GPU +crbug.com/326138 virtual/gpu/fast/canvas/canvas-composite-transformclip.html [ ImageOnlyFailure ] +crbug.com/326138 virtual/gpu/fast/canvas/canvas-composite.html [ ImageOnlyFailure ] +crbug.com/326138 virtual/gpu/fast/canvas/image-object-in-canvas.html [ ImageOnlyFailure ] +crbug.com/326138 virtual/gpu/fast/canvas/quadraticCurveTo.xml [ ImageOnlyFailure ] + # END OVERRIDES HERE (this line ensures that the file is newline-terminated) |