Move Canvas and WebGL Image Chromium behind experiments.

content/child/runtime_features.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/child/runtime_features.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/feature_list.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
 #include "content/common/content_switches_internal.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/content_switches.h"
 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
 #include "ui/gl/gl_switches.h"
 #include "ui/native_theme/native_theme_switches.h"
 
 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() {
 #if defined(OS_ANDROID)
   // Android does not have support for PagePopup
   WebRuntimeFeatures::enablePagePopup(false);
   // No plan to support complex UI for date/time INPUT types.
   WebRuntimeFeatures::enableInputMultipleFieldsUI(false);
   // Android does not yet support SharedWorker. crbug.com/154571
   WebRuntimeFeatures::enableSharedWorker(false);
@@ skipping 73 matching lines @@
     WebRuntimeFeatures::forceDisplayList2dCanvas(true);
 
   if (command_line.HasSwitch(switches::kEnableWebGLDraftExtensions))
     WebRuntimeFeatures::enableWebGLDraftExtensions(true);
 
 #if defined(OS_MACOSX)
   bool enable_canvas_2d_image_chromium = command_line.HasSwitch(
       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
   WebRuntimeFeatures::enableCanvas2dImageChromium(
       enable_canvas_2d_image_chromium);
 
 #if defined(OS_MACOSX)
   bool enable_web_gl_image_chromium = command_line.HasSwitch(
       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);
 #endif
   WebRuntimeFeatures::enableWebGLImageChromium(enable_web_gl_image_chromium);
 
   if (command_line.HasSwitch(switches::kForceOverlayFullscreenVideo))
     WebRuntimeFeatures::forceOverlayFullscreenVideo(true);
 
   if (ui::IsOverlayScrollbarEnabled())
@@ skipping 105 matching lines @@
   if (command_line.HasSwitch(switches::kDisableBlinkFeatures)) {
     std::vector<std::string> disabled_features = base::SplitString(
         command_line.GetSwitchValueASCII(switches::kDisableBlinkFeatures),
         ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
     for (const std::string& feature : disabled_features)
       WebRuntimeFeatures::enableFeatureFromString(feature, false);
   }
 }
 
 }  // namespace content