| Index: third_party/WebKit/Source/core/frame/ImageBitmapTest.cpp
|
| diff --git a/third_party/WebKit/Source/core/frame/ImageBitmapTest.cpp b/third_party/WebKit/Source/core/frame/ImageBitmapTest.cpp
|
| index 30265b361d74bcf5caa140bc6aa76ea2400e9193..91452ec5f660ef605801dce89cbf5dc8e23c66c1 100644
|
| --- a/third_party/WebKit/Source/core/frame/ImageBitmapTest.cpp
|
| +++ b/third_party/WebKit/Source/core/frame/ImageBitmapTest.cpp
|
| @@ -75,8 +75,8 @@ class ImageBitmapTest : public ::testing::Test {
|
| RuntimeEnabledFeatures::experimentalCanvasFeaturesEnabled();
|
| color_correct_rendering =
|
| RuntimeEnabledFeatures::colorCorrectRenderingEnabled();
|
| - color_correct_rendering_default_mode =
|
| - RuntimeEnabledFeatures::colorCorrectRenderingDefaultModeEnabled();
|
| + color_canvas_extensions =
|
| + RuntimeEnabledFeatures::colorCanvasExtensionsEnabled();
|
| }
|
| virtual void TearDown() {
|
| // Garbage collection is required prior to switching out the
|
| @@ -91,15 +91,15 @@ class ImageBitmapTest : public ::testing::Test {
|
| experimental_canvas_features);
|
| RuntimeEnabledFeatures::setColorCorrectRenderingEnabled(
|
| color_correct_rendering);
|
| - RuntimeEnabledFeatures::setColorCorrectRenderingDefaultModeEnabled(
|
| - color_correct_rendering_default_mode);
|
| + RuntimeEnabledFeatures::setColorCanvasExtensionsEnabled(
|
| + color_canvas_extensions);
|
| }
|
|
|
| sk_sp<SkImage> image_, image2_;
|
| Persistent<MemoryCache> global_memory_cache_;
|
| bool experimental_canvas_features;
|
| bool color_correct_rendering;
|
| - bool color_correct_rendering_default_mode;
|
| + bool color_canvas_extensions;
|
| };
|
|
|
| TEST_F(ImageBitmapTest, ImageResourceConsistency) {
|
| @@ -217,7 +217,7 @@ static ImageBitmapOptions PrepareBitmapOptionsAndSetRuntimeFlags(
|
| ColorSpaceConversion::DEFAULT_NOT_COLOR_CORRECTED);
|
| RuntimeEnabledFeatures::setExperimentalCanvasFeaturesEnabled(true);
|
| RuntimeEnabledFeatures::setColorCorrectRenderingEnabled(flag);
|
| - RuntimeEnabledFeatures::setColorCorrectRenderingDefaultModeEnabled(!flag);
|
| + RuntimeEnabledFeatures::setColorCanvasExtensionsEnabled(flag);
|
|
|
| return options;
|
| }
|
|
|