Move Canvas and WebGL Image Chromium behind experiments.

content/child/runtime_features.cc

Index: content/child/runtime_features.cc
diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
index 9ccead3bb72010954e2fba196a7566342d683164..aaff368313052e2cf0aaf100647c984d3c331676 100644
--- a/content/child/runtime_features.cc
+++ b/content/child/runtime_features.cc
@@ -21,6 +21,21 @@
 
 using blink::WebRuntimeFeatures;
 
+#if defined(OS_MACOSX)
+namespace {
+// If WebGL Image Chromium is allowed, this feature controls whether it is
+// enabled.
+const base::Feature kWebGLImageChromium{"WebGLImageChromium",
+                                        base::FEATURE_ENABLED_BY_DEFAULT};
+
+// If Canvas2D Image Chromium is allowed, this feature controls whether it is
+// enabled.
+const base::Feature kCanvas2DImageChromium{"kCanvas2DImageChromium",
+                                           base::FEATURE_ENABLED_BY_DEFAULT};
+
+}  // namespace

[Avi (use Gerrit), 2016/06/02 18:20:26]

Other features in this file are defined in
content/public/common/content_features.cc and referenced here (search this file
for base::FeatureList::IsEnabled). Why do these live here?

[erikchen, 2016/06/02 19:45:26]

Didn't know about it. Fixed.

+#endif  // defined(OS_MACOSX)
+
 namespace content {
 
 static void SetRuntimeFeatureDefaultsForPlatform() {
@@ -114,6 +129,11 @@ void SetRuntimeFeaturesDefaultsAndUpdateFromArgs(
       switches::kEnableGpuMemoryBufferCompositorResources) &&
       !command_line.HasSwitch(switches::kDisable2dCanvasImageChromium) &&
       !command_line.HasSwitch(switches::kDisableGpu);
+
+  if (enable_canvas_2d_image_chromium) {
+    enable_canvas_2d_image_chromium =
+        base::FeatureList::IsEnabled(kCanvas2DImageChromium);
+  }
 #else
   bool enable_canvas_2d_image_chromium = false;
 #endif
@@ -125,6 +145,11 @@ void SetRuntimeFeaturesDefaultsAndUpdateFromArgs(
       switches::kEnableGpuMemoryBufferCompositorResources) &&
       !command_line.HasSwitch(switches::kDisableWebGLImageChromium) &&
       !command_line.HasSwitch(switches::kDisableGpu);
+
+  if (enable_web_gl_image_chromium) {
+    enable_web_gl_image_chromium =
+        base::FeatureList::IsEnabled(kWebGLImageChromium);
+  }
 #else
   bool enable_web_gl_image_chromium =
       command_line.HasSwitch(switches::kEnableWebGLImageChromium);