summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfmalita@chromium.org <fmalita@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-06 10:47:20 +0000
committerfmalita@chromium.org <fmalita@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-06 10:47:20 +0000
commit0db294c0920aecd2312bb617863146f11b83c954 (patch)
treeb43ec4ed85bef9e1e0ac61ced794ae4a7728c819
parent6de7fc488e8b179cd4b4031510a42ab9d3c82b86 (diff)
downloadchromium_src-0db294c0920aecd2312bb617863146f11b83c954.zip
chromium_src-0db294c0920aecd2312bb617863146f11b83c954.tar.gz
chromium_src-0db294c0920aecd2312bb617863146f11b83c954.tar.bz2
Remove SK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE
(and suppress layout failures, pending rebaseline) BUG=380686 TBR=humper@google.com Review URL: https://codereview.chromium.org/314233002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275384 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--skia/skia_common.gypi3
-rw-r--r--skia/skia_test_expectations.txt16
2 files changed, 16 insertions, 3 deletions
diff --git a/skia/skia_common.gypi b/skia/skia_common.gypi
index 7eafc5a..1723019 100644
--- a/skia/skia_common.gypi
+++ b/skia/skia_common.gypi
@@ -204,9 +204,6 @@
'SK_DEFAULT_FONT_CACHE_LIMIT=<(default_font_cache_limit)',
'SK_USE_DISCARDABLE_SCALEDIMAGECACHE',
-
- # transitional, pending Blink suppressions/rebaselines
- 'SK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE',
],
'direct_dependent_settings': {
diff --git a/skia/skia_test_expectations.txt b/skia/skia_test_expectations.txt
index 4327f6e..e4b9003 100644
--- a/skia/skia_test_expectations.txt
+++ b/skia/skia_test_expectations.txt
@@ -48,4 +48,20 @@
#
# START OVERRIDES HERE
+# Rebaseline needed after removing SK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE
+crbug.com/380686 svg/W3C-SVG-1.1-SE/filters-image-03-f.svg [ ImageOnlyFailure ]
+crbug.com/380686 svg/batik/text/smallFonts.svg [ ImageOnlyFailure ]
+crbug.com/380686 svg/batik/text/textFeatures.svg [ ImageOnlyFailure ]
+crbug.com/380686 svg/dynamic-updates/SVGFEImageElement-dom-preserveAspectRatio-attr.html [ ImageOnlyFailure ]
+crbug.com/380686 svg/dynamic-updates/SVGFEImageElement-svgdom-preserveAspectRatio-prop.html [ ImageOnlyFailure ]
+crbug.com/380686 svg/filters/feImage-preserveAspectRatio-all.svg [ ImageOnlyFailure ]
+crbug.com/380686 svg/filters/filterRes.svg [ ImageOnlyFailure ]
+crbug.com/380686 virtual/android/fullscreen/full-screen-iframe-allowed-video.html [ ImageOnlyFailure ]
+crbug.com/380686 virtual/android/fullscreen/full-screen-stacking-context.html [ ImageOnlyFailure ]
+crbug.com/380686 virtual/android/fullscreen/video-controls-drag.html [ ImageOnlyFailure ]
+crbug.com/380686 virtual/android/fullscreen/video-controls-timeline.html [ ImageOnlyFailure ]
+crbug.com/380686 virtual/android/fullscreen/video-scrolled-iframe.html [ ImageOnlyFailure ]
+crbug.com/380686 virtual/android/fullscreen/video-specified-size.html [ ImageOnlyFailure ]
+crbug.com/380686 virtual/deferred/fast/images/ycbcr-with-cmyk-color-profile.html [ ImageOnlyFailure ]
+
# END OVERRIDES HERE (this line ensures that the file is newline-terminated)