summaryrefslogtreecommitdiffstats
path: root/skia
diff options
context:
space:
mode:
authorrobertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-19 13:40:59 +0000
committerrobertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-19 13:40:59 +0000
commit3f4d4bd4fc7780021b1c816f1797b719c14149aa (patch)
tree84c73940f210e0a089427ebe623a7b3b524a36fa /skia
parentb183147e6d71fdafc675a769abb07c568b47241b (diff)
downloadchromium_src-3f4d4bd4fc7780021b1c816f1797b719c14149aa.zip
chromium_src-3f4d4bd4fc7780021b1c816f1797b719c14149aa.tar.gz
chromium_src-3f4d4bd4fc7780021b1c816f1797b719c14149aa.tar.bz2
Roll to r13493
R=rmistry@google.com Review URL: https://codereview.chromium.org/167973005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252017 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
-rw-r--r--skia/skia_common.gypi1
-rw-r--r--skia/skia_test_expectations.txt8
2 files changed, 9 insertions, 0 deletions
diff --git a/skia/skia_common.gypi b/skia/skia_common.gypi
index 1c5aed2..b3866c7 100644
--- a/skia/skia_common.gypi
+++ b/skia/skia_common.gypi
@@ -149,6 +149,7 @@
'GR_GL_IGNORE_ES3_MSAA=0',
'SK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1',
'SK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1',
+ 'SK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT',
],
'default_font_cache_limit%': '(20*1024*1024)',
diff --git a/skia/skia_test_expectations.txt b/skia/skia_test_expectations.txt
index 9fd121c..c227825 100644
--- a/skia/skia_test_expectations.txt
+++ b/skia/skia_test_expectations.txt
@@ -55,4 +55,12 @@ crbug.com/341448 svg/W3C-SVG-1.1/filters-morph-01-f.svg [ ImageOnlyFailure ]
crbug.com/341448 svg/batik/text/smallFonts.svg [ ImageOnlyFailure ]
crbug.com/341448 svg/batik/text/textFeatures.svg [ ImageOnlyFailure ]
+# The Skia roll to r13482 altered the following layout tests:
+crbug.com/344497 virtual/deferred/fast/images/imagemap-focus-ring-zero-outline-width.html [ ImageOnlyFailure ]
+crbug.com/344497 virtual/deferred/fast/images/jpeg-with-color-profile.html [ ImageOnlyFailure ]
+crbug.com/344497 virtual/deferred/fast/images/png-with-color-profile.html [ ImageOnlyFailure ]
+crbug.com/344497 virtual/deferred/fast/images/rgb-png-with-cmyk-color-profile.html [ ImageOnlyFailure ]
+crbug.com/344497 virtual/deferred/fast/images/webp-color-profile-lossy.html [ ImageOnlyFailure ]
+crbug.com/344497 virtual/deferred/fast/images/ycbcr-with-cmyk-color-profile.html [ ImageOnlyFailure ]
+
# END OVERRIDES HERE (this line ensures that the file is newline-terminated)