summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorvangelis@chromium.org <vangelis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-08 05:53:04 +0000
committervangelis@chromium.org <vangelis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-08 05:53:04 +0000
commit01df051aaca50e92e2c03508426cf0dda7a54021 (patch)
tree7012f3c1410348b45d993b278064ea3953e1f1ea /chrome/browser
parent43b7a2ed125b9a259eed2d23cc8871cd6ec7b76f (diff)
downloadchromium_src-01df051aaca50e92e2c03508426cf0dda7a54021.zip
chromium_src-01df051aaca50e92e2c03508426cf0dda7a54021.tar.gz
chromium_src-01df051aaca50e92e2c03508426cf0dda7a54021.tar.bz2
Enable webgl and accelerated compositing by default on all platforms. Removes
--enable-webgl and --enable-accelerated-compositing flags and replaces them by --disable-webgl and --disable-accelerated-compositing. This CL is practically identical to: http://src.chromium.org/viewvc/chrome?view=rev&revision=58711 which was checked in the later reverted in: http://src.chromium.org/viewvc/chrome?view=rev&revision=58730 due to UI test failures related to video playback via the compositor. The main difference is that mac is no longer excluded so the two features are now turned on on all 3 platforms. The issue with the failing UI tests was corrected upstream in WebKit: http://trac.webkit.org/changeset/66923 so this WebKit change must be rolled in before the chromium change lands. BUG=54469 TEST=NONE Review URL: http://codereview.chromium.org/3348012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58792 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/renderer_host/browser_render_process_host.cc5
-rw-r--r--chrome/browser/tab_contents/render_view_host_delegate_helper.cc4
2 files changed, 4 insertions, 5 deletions
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index c5aad28..f7a9b17 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -560,10 +560,10 @@ void BrowserRenderProcessHost::PropagateBrowserCommandLineToRenderer(
// WebGLArray constructors on the DOMWindow visible. This
// information is needed very early during bringup. We prefer to
// use the WebPreferences to set this flag on a page-by-page basis.
- switches::kEnableExperimentalWebGL,
+ switches::kDisableExperimentalWebGL,
switches::kDisableGLSLTranslator,
switches::kInProcessWebGL,
- switches::kEnableAcceleratedCompositing,
+ switches::kDisableAcceleratedCompositing,
#if defined(OS_MACOSX)
// Allow this to be set when invoking the browser and relayed along.
switches::kEnableSandboxLogging,
@@ -577,7 +577,6 @@ void BrowserRenderProcessHost::PropagateBrowserCommandLineToRenderer(
switches::kDisableClickToPlay,
switches::kEnableResourceContentSettings,
switches::kPrelaunchGpuProcess,
- switches::kEnableAcceleratedCompositing,
switches::kEnableAcceleratedDecoding,
switches::kEnableFileSystem,
};
diff --git a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
index 49e6fab..0dddcc6 100644
--- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
+++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
@@ -275,7 +275,7 @@ WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs(
web_prefs.databases_enabled =
!command_line.HasSwitch(switches::kDisableDatabases);
web_prefs.experimental_webgl_enabled =
- command_line.HasSwitch(switches::kEnableExperimentalWebGL);
+ !command_line.HasSwitch(switches::kDisableExperimentalWebGL);
web_prefs.site_specific_quirks_enabled =
!command_line.HasSwitch(switches::kDisableSiteSpecificQuirks);
web_prefs.allow_file_access_from_file_urls =
@@ -283,7 +283,7 @@ WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs(
web_prefs.show_composited_layer_borders =
command_line.HasSwitch(switches::kShowCompositedLayerBorders);
web_prefs.accelerated_compositing_enabled =
- command_line.HasSwitch(switches::kEnableAcceleratedCompositing);
+ !command_line.HasSwitch(switches::kDisableAcceleratedCompositing);
web_prefs.accelerated_2d_canvas_enabled =
command_line.HasSwitch(switches::kEnableAccelerated2dCanvas);
web_prefs.memory_info_enabled =