summaryrefslogtreecommitdiffstats
path: root/skia
diff options
context:
space:
mode:
Diffstat (limited to 'skia')
-rw-r--r--skia/skia_library.gypi1
-rw-r--r--skia/skia_test_expectations.txt5
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)