diff options
| -rw-r--r-- | chrome/app/generated_resources.grd | 6 | ||||
| -rw-r--r-- | chrome/browser/about_flags.cc | 7 | ||||
| -rw-r--r-- | content/browser/renderer_host/render_process_host_impl.cc | 1 | ||||
| -rw-r--r-- | content/public/common/content_switches.cc | 4 | ||||
| -rw-r--r-- | content/public/common/content_switches.h | 1 | ||||
| -rw-r--r-- | content/renderer/render_thread_impl.cc | 3 |
6 files changed, 22 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 80fe583..fd11660 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -6384,6 +6384,12 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_FLAGS_FORCE_ACCELERATED_OVERFLOW_SCROLL_MODE_DESCRIPTION" desc="Description of the 'Accelerated overflow scroll mode' lab."> When possible, puts the scrolling contents of an overflow scrolling element onto a composited layer for faster scrolling. </message> + <message name="IDS_FLAGS_ENABLE_EXPERIMENTAL_CANVAS_FEATURES_NAME" desc="Name of the 'Enable experimental canvas features' lab."> + Enable experimental canvas features + </message> + <message name="IDS_FLAGS_ENABLE_EXPERIMENTAL_CANVAS_FEATURES_DESCRIPTION" desc="Description of the 'Enable experimental canvas features' lab."> + Enables the use of experimental canvas features which are still in development. + </message> <message name="IDS_FLAGS_DISABLE_ACCELERATED_2D_CANVAS_NAME" desc="Name of the 'Disable accelerated 2D canvas' lab."> Disable accelerated 2D canvas </message> diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index e16a472..2adf2ee 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -360,6 +360,13 @@ const Experiment kExperiments[] = { MULTI_VALUE_TYPE(kGDIPresentChoices) }, { + "enable-experimental-canvas-features", + IDS_FLAGS_ENABLE_EXPERIMENTAL_CANVAS_FEATURES_NAME, + IDS_FLAGS_ENABLE_EXPERIMENTAL_CANVAS_FEATURES_DESCRIPTION, + kOsAll, + SINGLE_VALUE_TYPE(switches::kEnableExperimentalCanvasFeatures) + }, + { "disable-accelerated-2d-canvas", IDS_FLAGS_DISABLE_ACCELERATED_2D_CANVAS_NAME, IDS_FLAGS_DISABLE_ACCELERATED_2D_CANVAS_DESCRIPTION, diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc index e6dee50..f2571dc 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -828,6 +828,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( switches::kDisableWebAudio, #endif switches::kEnableWebMIDI, + switches::kEnableExperimentalCanvasFeatures, switches::kEnableExperimentalWebSocket, switches::kDomAutomationController, switches::kEnableAccessibilityLogging, diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc index b3d57d9..3a6f474 100644 --- a/content/public/common/content_switches.cc +++ b/content/public/common/content_switches.cc @@ -44,6 +44,10 @@ const char kDisableAccelerated2dCanvas[] = "disable-accelerated-2d-canvas"; // Disable antialiasing on 2d canvas. const char kDisable2dCanvasAntialiasing[] = "disable-canvas-aa"; +// Enable experimental canvas features, e.g. canvas 2D context attributes +const char kEnableExperimentalCanvasFeatures[] + = "enable-experimental-canvas-features"; + // Disables accelerated compositing. const char kDisableAcceleratedCompositing[] = "disable-accelerated-compositing"; diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h index 275227d..2f0195a 100644 --- a/content/public/common/content_switches.h +++ b/content/public/common/content_switches.h @@ -21,6 +21,7 @@ CONTENT_EXPORT extern const char kBrowserAssertTest[]; CONTENT_EXPORT extern const char kBrowserCrashTest[]; CONTENT_EXPORT extern const char kBrowserSubprocessPath[]; CONTENT_EXPORT extern const char kDisable2dCanvasAntialiasing[]; +CONTENT_EXPORT extern const char kEnableExperimentalCanvasFeatures[]; CONTENT_EXPORT extern const char kDisable3DAPIs[]; CONTENT_EXPORT extern const char kDisableAccelerated2dCanvas[]; CONTENT_EXPORT extern const char kDisableAcceleratedCompositing[]; diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index 9076ee9..31c2805 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -796,6 +796,9 @@ void RenderThreadImpl::EnsureWebKitInitialized() { WebRuntimeFeatures::enableExperimentalWebSocket( command_line.HasSwitch(switches::kEnableExperimentalWebSocket)); + WebRuntimeFeatures::enableExperimentalCanvasFeatures( + command_line.HasSwitch(switches::kEnableExperimentalCanvasFeatures)); + FOR_EACH_OBSERVER(RenderProcessObserver, observers_, WebKitInitialized()); devtools_agent_message_filter_ = new DevToolsAgentFilter(); |