Force us to rely on tagged surfaces
... will cleanup the call-sites once this passes.
Bug: skia:8773
Change-Id: If997d36562a2b26d8a2dedd0bcbfe11163fcf8bc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1524702
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: ccameron <ccameron@chromium.org>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Florin Malita <fmalita@chromium.org>
Cr-Commit-Position: refs/heads/master@{#642826}diff --git a/third_party/blink/renderer/platform/graphics/canvas_2d_layer_bridge_test.cc b/third_party/blink/renderer/platform/graphics/canvas_2d_layer_bridge_test.cc
index 8724a3f..a50636c3 100644
--- a/third_party/blink/renderer/platform/graphics/canvas_2d_layer_bridge_test.cc
+++ b/third_party/blink/renderer/platform/graphics/canvas_2d_layer_bridge_test.cc
@@ -1233,8 +1233,6 @@
TEST_F(Canvas2DLayerBridgeTest, EnsureCCImageCacheUseWithColorConversion) {
auto color_params = CanvasColorParams(kSRGBCanvasColorSpace,
kRGBA8CanvasPixelFormat, kOpaque);
- ASSERT_TRUE(color_params.NeedsSkColorSpaceXformCanvas());
-
std::unique_ptr<Canvas2DLayerBridge> bridge =
MakeBridge(IntSize(300, 300), Canvas2DLayerBridge::kEnableAcceleration,
color_params);
diff --git a/third_party/blink/renderer/platform/graphics/canvas_color_params.cc b/third_party/blink/renderer/platform/graphics/canvas_color_params.cc
index cdcba06e..83f5651 100644
--- a/third_party/blink/renderer/platform/graphics/canvas_color_params.cc
+++ b/third_party/blink/renderer/platform/graphics/canvas_color_params.cc
@@ -48,8 +48,8 @@
: CanvasColorParams(info.refColorSpace(), info.colorType()) {}
bool CanvasColorParams::NeedsSkColorSpaceXformCanvas() const {
- return color_space_ == kSRGBCanvasColorSpace &&
- pixel_format_ == kRGBA8CanvasPixelFormat;
+ // Part of larger effort to remove ColorSpaceXformCanvas (reed)
+ return false;
}
std::unique_ptr<cc::PaintCanvas> CanvasColorParams::WrapCanvas(
