Switch to new (skcms) color space primaries implementation in Skia

Layout test diffs are low-bit changes due to floating point order-of-operations in the new code. Change-Id: Ie50c9913d2b29f0ddc5c99e6c0b35ad54ff0ef3f Reviewed-on: https://chromium-review.googlesource.com/1203932 Reviewed-by: ccameron <ccameron@chromium.org> Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Brian Osman <brianosman@google.com> Cr-Commit-Position: refs/heads/master@{#588941}
marcosholgado · Sep 5, 2018 · 9c9d3fe · 9c9d3fe
1 parent 38ff968
commit 9c9d3fe
Show file tree

Hide file tree

Showing 103 changed files with 3 additions and 7 deletions.
diff --git a/skia/config/SkUserConfig.h b/skia/config/SkUserConfig.h
@@ -183,10 +183,6 @@ SK_API void SkDebugf_FileLine(const char* file, int line, bool fatal,
 #define SK_SUPPORT_LEGACY_AAA_CHOICE
 #endif
 
-#ifndef SK_USE_LEGACY_PRIMARIES_TO_XYZ
-#define SK_USE_LEGACY_PRIMARIES_TO_XYZ
-#endif
-
 ///////////////////////// Imported from BUILD.gn and skia_common.gypi
 
 /* In some places Skia can use static initializers for global initialization,

diff --git a/third_party/WebKit/LayoutTests/hdr/color-jpeg-with-color-profile-expected.png b/third_party/WebKit/LayoutTests/hdr/color-jpeg-with-color-profile-expected.png
diff --git a/...outTests/platform/linux/compositing/geometry/video-fixed-scrolling-expected.png b/...outTests/platform/linux/compositing/geometry/video-fixed-scrolling-expected.png
diff --git a/...outTests/platform/linux/compositing/geometry/video-opacity-overlay-expected.png b/...outTests/platform/linux/compositing/geometry/video-opacity-overlay-expected.png
diff --git a/...ts/platform/linux/compositing/reflections/load-video-in-reflection-expected.png b/...ts/platform/linux/compositing/reflections/load-video-in-reflection-expected.png
diff --git a/...t/LayoutTests/platform/linux/fast/borders/border-radius-mask-video-expected.png b/...t/LayoutTests/platform/linux/fast/borders/border-radius-mask-video-expected.png
diff --git a/...utTests/platform/linux/fast/borders/border-radius-mask-video-ratio-expected.png b/...utTests/platform/linux/fast/borders/border-radius-mask-video-ratio-expected.png
diff --git a/...tTests/platform/linux/fast/borders/border-radius-mask-video-shadow-expected.png b/...tTests/platform/linux/fast/borders/border-radius-mask-video-shadow-expected.png
diff --git a/third_party/WebKit/LayoutTests/platform/linux/hdr/video-canvas-alpha-expected.png b/third_party/WebKit/LayoutTests/platform/linux/hdr/video-canvas-alpha-expected.png
diff --git a/...arty/WebKit/LayoutTests/platform/linux/media/controls-after-reload-expected.png b/...arty/WebKit/LayoutTests/platform/linux/media/controls-after-reload-expected.png
diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/controls-strict-expected.png b/third_party/WebKit/LayoutTests/platform/linux/media/controls-strict-expected.png
diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/controls-styling-expected.png b/third_party/WebKit/LayoutTests/platform/linux/media/controls-styling-expected.png
diff --git a/...ty/WebKit/LayoutTests/platform/linux/media/controls-styling-strict-expected.png b/...ty/WebKit/LayoutTests/platform/linux/media/controls-styling-strict-expected.png
diff --git a/...y/WebKit/LayoutTests/platform/linux/media/controls-without-preload-expected.png b/...y/WebKit/LayoutTests/platform/linux/media/controls-without-preload-expected.png
diff --git a/...s/platform/linux/media/controls/video-controls-with-cast-rendering-expected.png b/...s/platform/linux/media/controls/video-controls-with-cast-rendering-expected.png
diff --git a/...ayoutTests/platform/linux/media/track/track-cue-rendering-vertical-expected.png b/...ayoutTests/platform/linux/media/track/track-cue-rendering-vertical-expected.png
diff --git a/...d_party/WebKit/LayoutTests/platform/linux/media/video-aspect-ratio-expected.png b/...d_party/WebKit/LayoutTests/platform/linux/media/video-aspect-ratio-expected.png
diff --git a/...d_party/WebKit/LayoutTests/platform/linux/media/video-canvas-alpha-expected.png b/...d_party/WebKit/LayoutTests/platform/linux/media/video-canvas-alpha-expected.png
diff --git a/...y/WebKit/LayoutTests/platform/linux/media/video-controls-rendering-expected.png b/...y/WebKit/LayoutTests/platform/linux/media/video-controls-rendering-expected.png
diff --git a/...party/WebKit/LayoutTests/platform/linux/media/video-display-toggle-expected.png b/...party/WebKit/LayoutTests/platform/linux/media/video-display-toggle-expected.png
diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/video-layer-crash-expected.png b/third_party/WebKit/LayoutTests/platform/linux/media/video-layer-crash-expected.png
diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/video-zoom-expected.png b/third_party/WebKit/LayoutTests/platform/linux/media/video-zoom-expected.png
diff --git a/.../linux/virtual/android/fullscreen/full-screen-iframe-allowed-video-expected.png b/.../linux/virtual/android/fullscreen/full-screen-iframe-allowed-video-expected.png
diff --git a/.../platform/linux/virtual/android/fullscreen/video-controls-timeline-expected.png b/.../platform/linux/virtual/android/fullscreen/video-controls-timeline-expected.png
diff --git a/...ts/platform/linux/virtual/android/fullscreen/video-scrolled-iframe-expected.png b/...ts/platform/linux/virtual/android/fullscreen/video-scrolled-iframe-expected.png
diff --git a/...x/virtual/exotic-color-space/images/color-profile-image-filter-all-expected.png b/...x/virtual/exotic-color-space/images/color-profile-image-filter-all-expected.png
diff --git a/...layback-pipeline/media/controls/video-controls-with-cast-rendering-expected.png b/...layback-pipeline/media/controls/video-controls-with-cast-rendering-expected.png
diff --git a/...form/linux/virtual/video-surface-layer/media/controls-after-reload-expected.png b/...form/linux/virtual/video-surface-layer/media/controls-after-reload-expected.png
diff --git a/...s/platform/linux/virtual/video-surface-layer/media/controls-strict-expected.png b/...s/platform/linux/virtual/video-surface-layer/media/controls-strict-expected.png
diff --git a/.../platform/linux/virtual/video-surface-layer/media/controls-styling-expected.png b/.../platform/linux/virtual/video-surface-layer/media/controls-styling-expected.png
diff --git a/...rm/linux/virtual/video-surface-layer/media/controls-styling-strict-expected.png b/...rm/linux/virtual/video-surface-layer/media/controls-styling-strict-expected.png
diff --git a/...m/linux/virtual/video-surface-layer/media/controls-without-preload-expected.png b/...m/linux/virtual/video-surface-layer/media/controls-without-preload-expected.png
diff --git a/...eo-surface-layer/media/controls/video-controls-with-cast-rendering-expected.png b/...eo-surface-layer/media/controls/video-controls-with-cast-rendering-expected.png
diff --git a/...rtual/video-surface-layer/media/track/track-cue-rendering-vertical-expected.png b/...rtual/video-surface-layer/media/track/track-cue-rendering-vertical-expected.png
diff --git a/...latform/linux/virtual/video-surface-layer/media/video-aspect-ratio-expected.png b/...latform/linux/virtual/video-surface-layer/media/video-aspect-ratio-expected.png
diff --git a/...latform/linux/virtual/video-surface-layer/media/video-canvas-alpha-expected.png b/...latform/linux/virtual/video-surface-layer/media/video-canvas-alpha-expected.png
diff --git a/...m/linux/virtual/video-surface-layer/media/video-controls-rendering-expected.png b/...m/linux/virtual/video-surface-layer/media/video-controls-rendering-expected.png
diff --git a/...tform/linux/virtual/video-surface-layer/media/video-display-toggle-expected.png b/...tform/linux/virtual/video-surface-layer/media/video-display-toggle-expected.png
diff --git a/...platform/linux/virtual/video-surface-layer/media/video-layer-crash-expected.png b/...platform/linux/virtual/video-surface-layer/media/video-layer-crash-expected.png
diff --git a/...LayoutTests/platform/mac/compositing/layers-inside-overflow-scroll-expected.png b/...LayoutTests/platform/mac/compositing/layers-inside-overflow-scroll-expected.png
diff --git a/...y/WebKit/LayoutTests/platform/mac/compositing/self-painting-layers-expected.png b/...y/WebKit/LayoutTests/platform/mac/compositing/self-painting-layers-expected.png
diff --git a/...rty/WebKit/LayoutTests/platform/mac/media/color-profile-video-seek-expected.png b/...rty/WebKit/LayoutTests/platform/mac/media/color-profile-video-seek-expected.png
diff --git a/...Kit/LayoutTests/platform/mac/media/color-profile-video-seek-filter-expected.png b/...Kit/LayoutTests/platform/mac/media/color-profile-video-seek-filter-expected.png
diff --git a/...LayoutTests/platform/mac/media/color-profile-video-seek-object-fit-expected.png b/...LayoutTests/platform/mac/media/color-profile-video-seek-object-fit-expected.png
diff --git a/..._party/WebKit/LayoutTests/platform/mac/media/video-replaces-poster-expected.png b/..._party/WebKit/LayoutTests/platform/mac/media/video-replaces-poster-expected.png
diff --git a/.../mac/virtual/exotic-color-space/images/color-profile-border-radius-expected.png b/.../mac/virtual/exotic-color-space/images/color-profile-border-radius-expected.png
diff --git a/...latform/mac/virtual/exotic-color-space/images/color-profile-filter-expected.png b/...latform/mac/virtual/exotic-color-space/images/color-profile-filter-expected.png
diff --git a/...platform/mac/virtual/exotic-color-space/images/color-profile-group-expected.png b/...platform/mac/virtual/exotic-color-space/images/color-profile-group-expected.png
diff --git a/...c/virtual/exotic-color-space/images/color-profile-image-canvas-svg-expected.png b/...c/virtual/exotic-color-space/images/color-profile-image-canvas-svg-expected.png
diff --git a/...platform/mac/virtual/exotic-color-space/images/color-profile-image-expected.png b/...platform/mac/virtual/exotic-color-space/images/color-profile-image-expected.png
diff --git a/...c/virtual/exotic-color-space/images/color-profile-image-filter-all-expected.png b/...c/virtual/exotic-color-space/images/color-profile-image-filter-all-expected.png
diff --git a/...platform/mac/virtual/exotic-color-space/images/color-profile-layer-expected.png b/...platform/mac/virtual/exotic-color-space/images/color-profile-layer-expected.png
diff --git a/...ayoutTests/platform/win/compositing/geometry/video-fixed-scrolling-expected.png b/...ayoutTests/platform/win/compositing/geometry/video-fixed-scrolling-expected.png
diff --git a/...ayoutTests/platform/win/compositing/geometry/video-opacity-overlay-expected.png b/...ayoutTests/platform/win/compositing/geometry/video-opacity-overlay-expected.png
diff --git a/...ests/platform/win/compositing/reflections/load-video-in-reflection-expected.png b/...ests/platform/win/compositing/reflections/load-video-in-reflection-expected.png
diff --git a/...Kit/LayoutTests/platform/win/fast/borders/border-radius-mask-video-expected.png b/...Kit/LayoutTests/platform/win/fast/borders/border-radius-mask-video-expected.png
diff --git a/...youtTests/platform/win/fast/borders/border-radius-mask-video-ratio-expected.png b/...youtTests/platform/win/fast/borders/border-radius-mask-video-ratio-expected.png
diff --git a/...outTests/platform/win/fast/borders/border-radius-mask-video-shadow-expected.png b/...outTests/platform/win/fast/borders/border-radius-mask-video-shadow-expected.png
diff --git a/third_party/WebKit/LayoutTests/platform/win/hdr/video-canvas-alpha-expected.png b/third_party/WebKit/LayoutTests/platform/win/hdr/video-canvas-alpha-expected.png
diff --git a/..._party/WebKit/LayoutTests/platform/win/media/controls-after-reload-expected.png b/..._party/WebKit/LayoutTests/platform/win/media/controls-after-reload-expected.png
diff --git a/third_party/WebKit/LayoutTests/platform/win/media/controls-strict-expected.png b/third_party/WebKit/LayoutTests/platform/win/media/controls-strict-expected.png
diff --git a/third_party/WebKit/LayoutTests/platform/win/media/controls-styling-expected.png b/third_party/WebKit/LayoutTests/platform/win/media/controls-styling-expected.png
diff --git a/...arty/WebKit/LayoutTests/platform/win/media/controls-styling-strict-expected.png b/...arty/WebKit/LayoutTests/platform/win/media/controls-styling-strict-expected.png
diff --git a/...rty/WebKit/LayoutTests/platform/win/media/controls-without-preload-expected.png b/...rty/WebKit/LayoutTests/platform/win/media/controls-without-preload-expected.png
diff --git a/.../LayoutTests/platform/win/media/track/track-cue-rendering-vertical-expected.png b/.../LayoutTests/platform/win/media/track/track-cue-rendering-vertical-expected.png
diff --git a/third_party/WebKit/LayoutTests/platform/win/media/video-aspect-ratio-expected.png b/third_party/WebKit/LayoutTests/platform/win/media/video-aspect-ratio-expected.png
diff --git a/third_party/WebKit/LayoutTests/platform/win/media/video-canvas-alpha-expected.png b/third_party/WebKit/LayoutTests/platform/win/media/video-canvas-alpha-expected.png
diff --git a/...rty/WebKit/LayoutTests/platform/win/media/video-controls-rendering-expected.png b/...rty/WebKit/LayoutTests/platform/win/media/video-controls-rendering-expected.png
diff --git a/...d_party/WebKit/LayoutTests/platform/win/media/video-display-toggle-expected.png b/...d_party/WebKit/LayoutTests/platform/win/media/video-display-toggle-expected.png
diff --git a/third_party/WebKit/LayoutTests/platform/win/media/video-layer-crash-expected.png b/third_party/WebKit/LayoutTests/platform/win/media/video-layer-crash-expected.png
diff --git a/...WebKit/LayoutTests/platform/win/media/video-remove-insert-repaints-expected.png b/...WebKit/LayoutTests/platform/win/media/video-remove-insert-repaints-expected.png
diff --git a/third_party/WebKit/LayoutTests/platform/win/media/video-zoom-expected.png b/third_party/WebKit/LayoutTests/platform/win/media/video-zoom-expected.png
diff --git a/.../win/virtual/exotic-color-space/images/color-profile-border-radius-expected.png b/.../win/virtual/exotic-color-space/images/color-profile-border-radius-expected.png
diff --git a/...latform/win/virtual/exotic-color-space/images/color-profile-filter-expected.png b/...latform/win/virtual/exotic-color-space/images/color-profile-filter-expected.png
diff --git a/...platform/win/virtual/exotic-color-space/images/color-profile-group-expected.png b/...platform/win/virtual/exotic-color-space/images/color-profile-group-expected.png
diff --git a/...n/virtual/exotic-color-space/images/color-profile-image-canvas-svg-expected.png b/...n/virtual/exotic-color-space/images/color-profile-image-canvas-svg-expected.png
diff --git a/...platform/win/virtual/exotic-color-space/images/color-profile-image-expected.png b/...platform/win/virtual/exotic-color-space/images/color-profile-image-expected.png
diff --git a/...n/virtual/exotic-color-space/images/color-profile-image-filter-all-expected.png b/...n/virtual/exotic-color-space/images/color-profile-image-filter-all-expected.png
diff --git a/...platform/win/virtual/exotic-color-space/images/color-profile-layer-expected.png b/...platform/win/virtual/exotic-color-space/images/color-profile-layer-expected.png
diff --git a/...m/win/virtual/exotic-color-space/images/color-profile-layer-filter-expected.png b/...m/win/virtual/exotic-color-space/images/color-profile-layer-filter-expected.png
diff --git a/...atform/win/virtual/video-surface-layer/media/controls-after-reload-expected.png b/...atform/win/virtual/video-surface-layer/media/controls-after-reload-expected.png
diff --git a/...sts/platform/win/virtual/video-surface-layer/media/controls-strict-expected.png b/...sts/platform/win/virtual/video-surface-layer/media/controls-strict-expected.png
diff --git a/...ts/platform/win/virtual/video-surface-layer/media/controls-styling-expected.png b/...ts/platform/win/virtual/video-surface-layer/media/controls-styling-expected.png
diff --git a/...form/win/virtual/video-surface-layer/media/controls-styling-strict-expected.png b/...form/win/virtual/video-surface-layer/media/controls-styling-strict-expected.png
diff --git a/...orm/win/virtual/video-surface-layer/media/controls-without-preload-expected.png b/...orm/win/virtual/video-surface-layer/media/controls-without-preload-expected.png
diff --git a/.../platform/win/virtual/video-surface-layer/media/video-canvas-alpha-expected.png b/.../platform/win/virtual/video-surface-layer/media/video-canvas-alpha-expected.png
diff --git a/...orm/win/virtual/video-surface-layer/media/video-controls-rendering-expected.png b/...orm/win/virtual/video-surface-layer/media/video-controls-rendering-expected.png
diff --git a/...latform/win/virtual/video-surface-layer/media/video-display-toggle-expected.png b/...latform/win/virtual/video-surface-layer/media/video-display-toggle-expected.png
diff --git a/...s/platform/win/virtual/video-surface-layer/media/video-layer-crash-expected.png b/...s/platform/win/virtual/video-surface-layer/media/video-layer-crash-expected.png
diff --git a/...LayoutTests/platform/win7/media/track/track-cue-rendering-vertical-expected.png b/...LayoutTests/platform/win7/media/track/track-cue-rendering-vertical-expected.png
diff --git a/...rtual/video-surface-layer/media/track/track-cue-rendering-vertical-expected.png b/...rtual/video-surface-layer/media/track/track-cue-rendering-vertical-expected.png
diff --git a/...bKit/LayoutTests/virtual/exotic-color-space/images/cHRM_color_spin-expected.png b/...bKit/LayoutTests/virtual/exotic-color-space/images/cHRM_color_spin-expected.png
diff --git a/...ual/exotic-color-space/images/color-profile-background-image-space-expected.png b/...ual/exotic-color-space/images/color-profile-background-image-space-expected.png
diff --git a/...Tests/virtual/exotic-color-space/images/color-profile-image-canvas-expected.png b/...Tests/virtual/exotic-color-space/images/color-profile-image-canvas-expected.png
diff --git a/...rtual/exotic-color-space/images/color-profile-image-canvas-pattern-expected.png b/...rtual/exotic-color-space/images/color-profile-image-canvas-pattern-expected.png
diff --git a/...ual/exotic-color-space/images/color-profile-image-svg-resource-url-expected.png b/...ual/exotic-color-space/images/color-profile-image-svg-resource-url-expected.png
diff --git a/...sts/virtual/exotic-color-space/images/color-profile-mask-image-svg-expected.png b/...sts/virtual/exotic-color-space/images/color-profile-mask-image-svg-expected.png
diff --git a/...ests/virtual/exotic-color-space/images/jpeg-yuv-progressive-canvas-expected.png b/...ests/virtual/exotic-color-space/images/jpeg-yuv-progressive-canvas-expected.png
diff --git a/...Tests/virtual/exotic-color-space/images/jpeg-yuv-progressive-image-expected.png b/...Tests/virtual/exotic-color-space/images/jpeg-yuv-progressive-image-expected.png
diff --git a/...ests/virtual/exotic-color-space/images/webp-color-profile-lossless-expected.png b/...ests/virtual/exotic-color-space/images/webp-color-profile-lossless-expected.png
diff --git a/...s/virtual/exotic-color-space/images/webp-color-profile-lossy-alpha-expected.png b/...s/virtual/exotic-color-space/images/webp-color-profile-lossy-alpha-expected.png
diff --git a/...utTests/virtual/exotic-color-space/images/webp-color-profile-lossy-expected.png b/...utTests/virtual/exotic-color-space/images/webp-color-profile-lossy-expected.png
diff --git a/ui/gfx/color_transform_unittest.cc b/ui/gfx/color_transform_unittest.cc
@@ -492,9 +492,9 @@ TEST(SimpleColorSpace, MAYBE_SampleShaderSource) {
       "  color.r = TransferFn1(color.r);\n"
       "  color.g = TransferFn1(color.g);\n"
       "  color.b = TransferFn1(color.b);\n"
-      "  color = mat3(6.27403915e-01, 6.90973178e-02, 1.63914412e-02,\n"
-      "               3.29283148e-01, 9.19540286e-01, 8.80132914e-02,\n"
-      "               4.33131084e-02, 1.13623003e-02, 8.95595253e-01) "
+      "  color = mat3(6.27404153e-01, 6.90974146e-02, 1.63914431e-02,\n"
+      "               3.29283088e-01, 9.19540644e-01, 8.80132765e-02,\n"
+      "               4.33131084e-02, 1.13623096e-02, 8.95595253e-01) "
       "* color;\n"
       "  color.r = TransferFn3(color.r);\n"
       "  color.g = TransferFn3(color.g);\n"