color: Add ColorCanvasExtensions runtime flag

third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp

Index: third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp
diff --git a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp
index 5d1cad9139da64df6c9b58b3deb1da86ec43d77a..76081f4fa74e6927ab1f467c00182b0a45afe9d9 100644
--- a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp
+++ b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp
@@ -43,15 +43,6 @@ using ::testing::Mock;
 
 namespace blink {
 
-namespace {
-
-gfx::ColorSpace AdobeRGBColorSpace() {
-  return gfx::ColorSpace(gfx::ColorSpace::PrimaryID::ADOBE_RGB,
-                         gfx::ColorSpace::TransferID::GAMMA22);
-}
-
-}  // namespace
-
 enum BitmapOpacity { kOpaqueBitmap, kTransparentBitmap };
 
 class FakeImageSource : public CanvasImageSource {
@@ -1116,90 +1107,6 @@ TEST_F(CanvasRenderingContext2DTest, DisableAcceleration) {
   EXPECT_EQ(0u, GetGlobalAcceleratedImageBufferCount());
 }
 
-TEST_F(CanvasRenderingContext2DTest,
-       LegacyColorSpaceUsesGlobalTargetColorBehavior) {
-  // Set the global target color space to something distinctly recognizable (not
-  // srgb)
-  gfx::ColorSpace saved_global_target_color_space =
-      ColorBehavior::GlobalTargetColorSpace();
-  ColorBehavior::SetGlobalTargetColorSpaceForTesting(AdobeRGBColorSpace());
-  bool saved_color_correct_rendering_enabled =
-      RuntimeEnabledFeatures::colorCorrectRenderingEnabled();
-
-  RuntimeEnabledFeatures::setColorCorrectRenderingEnabled(false);
-  CreateContext(kNonOpaque, "legacy-srgb");
-  ColorBehavior behavior = Context2d()->DrawImageColorBehavior();
-  EXPECT_TRUE(behavior.IsTransformToTargetColorSpace());
-  EXPECT_TRUE(ColorBehavior::GlobalTargetColorSpace() ==
-              behavior.TargetColorSpace());
-
-  // Restore global state to avoid interfering with other tests
-  ColorBehavior::SetGlobalTargetColorSpaceForTesting(
-      saved_global_target_color_space);
-  RuntimeEnabledFeatures::setColorCorrectRenderingEnabled(
-      saved_color_correct_rendering_enabled);
-}
-
-TEST_F(CanvasRenderingContext2DTest,
-       LegacyColorSpaceUsesSRGBWhenColorCorrectRenderingEnabled) {
-  // Set the global target color space to something distinctly recognizable (not
-  // srgb)
-  gfx::ColorSpace saved_global_target_color_space =
-      ColorBehavior::GlobalTargetColorSpace();
-  ColorBehavior::SetGlobalTargetColorSpaceForTesting(AdobeRGBColorSpace());
-  bool saved_color_correct_rendering_enabled =
-      RuntimeEnabledFeatures::colorCorrectRenderingEnabled();
-
-  RuntimeEnabledFeatures::setColorCorrectRenderingEnabled(true);
-  CreateContext(kNonOpaque, "legacy-srgb");
-  ColorBehavior behavior = Context2d()->DrawImageColorBehavior();
-  EXPECT_TRUE(behavior.IsTransformToTargetColorSpace());
-  EXPECT_TRUE(gfx::ColorSpace::CreateSRGB() == behavior.TargetColorSpace());
-
-  // Restore global state to avoid interfering with other tests
-  ColorBehavior::SetGlobalTargetColorSpaceForTesting(
-      saved_global_target_color_space);
-  RuntimeEnabledFeatures::setColorCorrectRenderingEnabled(
-      saved_color_correct_rendering_enabled);
-}
-
-TEST_F(CanvasRenderingContext2DTest,

[Justin Novosad, 2017/05/23 19:20:28]

Why is this test being removed?

[ccameron, 2017/05/23 19:23:49]

This is testing DrawImageColorBehavior(), but that function had no callers, and
has been removed.

Also, the behavior for image content is:
- if no color management enabled, then "transform to global target"
- in all other cases, tag the image

So the behavior that this is testing (that images should be pre-transformed) is
not applicable anymore. 

-       SRGBColorSpaceUsesTransformToSRGBColorBehavior) {
-  // Set the global target color space to something distinctly recognizable (not
-  // srgb)
-  gfx::ColorSpace saved_global_target_color_space =
-      ColorBehavior::GlobalTargetColorSpace();
-  ColorBehavior::SetGlobalTargetColorSpaceForTesting(AdobeRGBColorSpace());
-
-  CreateContext(kNonOpaque, "srgb");
-  ColorBehavior behavior = Context2d()->DrawImageColorBehavior();
-  EXPECT_TRUE(behavior.IsTransformToTargetColorSpace());
-  EXPECT_TRUE(gfx::ColorSpace::CreateSRGB() == behavior.TargetColorSpace());
-
-  // Restore global state to avoid interfering with other tests
-  ColorBehavior::SetGlobalTargetColorSpaceForTesting(
-      saved_global_target_color_space);
-}
-
-TEST_F(CanvasRenderingContext2DTest,

[Justin Novosad, 2017/05/23 19:20:28]

and this one?

[ccameron, 2017/05/23 19:23:49]

(same deal -- the behavior will be always be "tag" as soon as we enable color
correct rendering)

-       LinearRGBColorSpaceUsesTransformToLinearSRGBColorBehavior) {
-  // Set the global target color space to something distinctly recognizable (not
-  // srgb)
-  gfx::ColorSpace saved_global_target_color_space =
-      ColorBehavior::GlobalTargetColorSpace();
-  ColorBehavior::SetGlobalTargetColorSpaceForTesting(AdobeRGBColorSpace());
-
-  CreateContext(kNonOpaque, "srgb", kLinearPixelMathEnabled);
-  ColorBehavior behavior = Context2d()->DrawImageColorBehavior();
-  EXPECT_TRUE(behavior.IsTransformToTargetColorSpace());
-  EXPECT_TRUE(gfx::ColorSpace::CreateSCRGBLinear() ==
-              behavior.TargetColorSpace());
-
-  // Restore global state to avoid interfering with other tests
-  ColorBehavior::SetGlobalTargetColorSpaceForTesting(
-      saved_global_target_color_space);
-}
-
 enum class ColorSpaceConversion : uint8_t {
   NONE = 0,
   DEFAULT_NOT_COLOR_CORRECTED = 1,
@@ -1224,7 +1131,6 @@ static ImageBitmapOptions PrepareBitmapOptionsAndSetRuntimeFlags(
                ColorSpaceConversion::DEFAULT_NOT_COLOR_CORRECTED);
   RuntimeEnabledFeatures::setExperimentalCanvasFeaturesEnabled(true);
   RuntimeEnabledFeatures::setColorCorrectRenderingEnabled(flag);
-  RuntimeEnabledFeatures::setColorCorrectRenderingDefaultModeEnabled(!flag);
 
   return options;
 }
@@ -1234,8 +1140,6 @@ TEST_F(CanvasRenderingContext2DTest, ImageBitmapColorSpaceConversion) {
       RuntimeEnabledFeatures::experimentalCanvasFeaturesEnabled();
   bool color_correct_rendering_runtime_flag =
       RuntimeEnabledFeatures::colorCorrectRenderingEnabled();
-  bool color_correct_rendering_default_mode_runtime_flag =
-      RuntimeEnabledFeatures::colorCorrectRenderingDefaultModeEnabled();
 
   Persistent<HTMLCanvasElement> canvas =
       Persistent<HTMLCanvasElement>(CanvasElement());
@@ -1326,8 +1230,6 @@ TEST_F(CanvasRenderingContext2DTest, ImageBitmapColorSpaceConversion) {
       experimental_canvas_features_runtime_flag);
   RuntimeEnabledFeatures::setColorCorrectRenderingEnabled(
       color_correct_rendering_runtime_flag);
-  RuntimeEnabledFeatures::setColorCorrectRenderingDefaultModeEnabled(
-      color_correct_rendering_default_mode_runtime_flag);
 }
 
 bool ConvertPixelsToColorSpaceAndPixelFormatForTest(