summaryrefslogtreecommitdiffstats
path: root/skia
diff options
context:
space:
mode:
Diffstat (limited to 'skia')
-rw-r--r--skia/config/SkUserConfig.h4
-rw-r--r--skia/skia_test_expectations.txt6
2 files changed, 6 insertions, 4 deletions
diff --git a/skia/config/SkUserConfig.h b/skia/config/SkUserConfig.h
index af5062c..4e0caea 100644
--- a/skia/config/SkUserConfig.h
+++ b/skia/config/SkUserConfig.h
@@ -245,10 +245,6 @@ SK_API void SkDebugf_FileLine(const char* file, int line, bool fatal,
# define SK_SUPPORT_LEGACY_GETTOPDEVICE
#endif
-#ifndef SK_NO_SPECIALIZED_AA_XFERMODES
-# define SK_NO_SPECIALIZED_AA_XFERMODES
-#endif
-
#ifndef SK_SUPPORT_LEGACY_IMAGEFILTER_CTM
# define SK_SUPPORT_LEGACY_IMAGEFILTER_CTM
#endif
diff --git a/skia/skia_test_expectations.txt b/skia/skia_test_expectations.txt
index 4327f6e..482cc35 100644
--- a/skia/skia_test_expectations.txt
+++ b/skia/skia_test_expectations.txt
@@ -48,4 +48,10 @@
#
# START OVERRIDES HERE
+# https://codereview.chromium.org/1149853004
+crbug.com/500591 fast/canvas/canvas-composite-transformclip.html [ NeedsManualRebaseline ]
+crbug.com/500591 fast/canvas/canvas-composite.html [ NeedsManualRebaseline ]
+crbug.com/500591 virtual/display_list_2d_canvas/fast/canvas/canvas-composite-transformclip.html [ NeedsManualRebaseline ]
+crbug.com/500591 virtual/display_list_2d_canvas/fast/canvas/canvas-composite.html [ NeedsManualRebaseline ]
+
# END OVERRIDES HERE (this line ensures that the file is newline-terminated)