diff options
author | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-20 13:22:03 +0000 |
---|---|---|
committer | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-20 13:22:03 +0000 |
commit | c93fe3e418745071dfd2e87bef827b78e82e5c15 (patch) | |
tree | cb2483dfd373cc973ec62a253aff4e83e5cbd20f /skia | |
parent | 5a70f7af48e78181575cf25d67347ba0d47da0e0 (diff) | |
download | chromium_src-c93fe3e418745071dfd2e87bef827b78e82e5c15.zip chromium_src-c93fe3e418745071dfd2e87bef827b78e82e5c15.tar.gz chromium_src-c93fe3e418745071dfd2e87bef827b78e82e5c15.tar.bz2 |
Roll Skia DEPS to 11409 with suppressions
R=bsalomon@google.com
Review URL: https://codereview.chromium.org/24258007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224374 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
-rw-r--r-- | skia/skia_library.gypi | 1 | ||||
-rw-r--r-- | skia/skia_test_expectations.txt | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/skia/skia_library.gypi b/skia/skia_library.gypi index 267f586..9c8edc4 100644 --- a/skia/skia_library.gypi +++ b/skia/skia_library.gypi @@ -52,7 +52,6 @@ 'default_font_cache_limit': '(1*1024*1024)', 'skia_export_defines': [ 'SK_BUILD_FOR_ANDROID', - 'USE_CHROMIUM_SKIA', ], }], ], diff --git a/skia/skia_test_expectations.txt b/skia/skia_test_expectations.txt index 8928164..bfae6ee 100644 --- a/skia/skia_test_expectations.txt +++ b/skia/skia_test_expectations.txt @@ -63,4 +63,9 @@ crbug.com/292656 css3/filters/effect-reference-colorspace-hw.html [ ImageOnlyFai crbug.com/292656 css3/filters/effect-reference-hw.html [ ImageOnlyFailure ] crbug.com/292656 css3/filters/effect-reference-subregion-hw.html [ ImageOnlyFailure ] +# Skia r11365 slightly changed how the GPU draws lines +crbug.com/295579 virtual/gpu/fast/canvas/canvas-text-baseline.html [ ImageOnlyFailure ] +crbug.com/295579 virtual/gpu/fast/canvas/canvas-transforms-during-path.html [ ImageOnlyFailure ] +crbug.com/295579 virtual/gpu/fast/canvas/quadraticCurveTo.xml [ ImageOnlyFailure ] + # END OVERRIDES HERE (this line ensures that the file is newline-terminated) |