diff options
author | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-12 12:57:57 +0000 |
---|---|---|
committer | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-12 12:57:57 +0000 |
commit | 5ed41e2ebb0f34201a21bfd1244f029b0e17ddad (patch) | |
tree | 12a3bc0d3385836ed49a10b528b4ef14293e228e /skia | |
parent | 5ec8c9689563cf8662a80175adce3c0a9bcf8e88 (diff) | |
download | chromium_src-5ed41e2ebb0f34201a21bfd1244f029b0e17ddad.zip chromium_src-5ed41e2ebb0f34201a21bfd1244f029b0e17ddad.tar.gz chromium_src-5ed41e2ebb0f34201a21bfd1244f029b0e17ddad.tar.bz2 |
Roll Skia DEPS to r8087 (take 2)
control: https://codereview.chromium.org/12730016/
Review URL: https://codereview.chromium.org/12764019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187569 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
-rw-r--r-- | skia/skia.gyp | 1 | ||||
-rw-r--r-- | skia/skia_test_expectations.txt | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index 66531c6..8c3aa6b 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -235,6 +235,7 @@ 'SK_DISABLE_BLUR_ROUNDING', 'SK_IGNORE_SUBPIXEL_AXIS_ALIGN_FIX', 'SK_IGNORE_PICTURE_RECORD_SAVE_LAYER_OPT', + 'SK_IGNORE_FAST_RECT_BLUR', # Disable this check because it is too strict for some Chromium-specific # subclasses of SkPixelRef. See bug: crbug.com/171776. diff --git a/skia/skia_test_expectations.txt b/skia/skia_test_expectations.txt index 4327f6e..690baa4 100644 --- a/skia/skia_test_expectations.txt +++ b/skia/skia_test_expectations.txt @@ -48,4 +48,6 @@ # # START OVERRIDES HERE +crbug.com/181700 fast/writing-mode/Kusa-Makura-background-canvas.html [ ImageOnlyFailure ] + # END OVERRIDES HERE (this line ensures that the file is newline-terminated) |