diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/renderer_host/browser_render_process_host.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/tab_contents/render_view_host_delegate_helper.cc | 4 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.cc | 13 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.h | 4 | ||||
| -rw-r--r-- | chrome/common/sandbox_init_wrapper_mac.cc | 2 | ||||
| -rw-r--r-- | chrome/common/sandbox_policy.cc | 2 | ||||
| -rw-r--r-- | chrome/renderer/render_thread.cc | 2 | ||||
| -rw-r--r-- | chrome/renderer/render_view.cc | 2 | ||||
| -rw-r--r-- | chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc | 4 |
9 files changed, 19 insertions, 19 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 = diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 4c916d3..74ef4ca 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -117,6 +117,10 @@ const char kDebugPrint[] = "debug-print"; // Triggers a pletora of diagnostic modes. const char kDiagnostics[] = "diagnostics"; +// Disables accelerated compositing. +const char kDisableAcceleratedCompositing[] = + "disable-accelerated-compositing"; + // Disables the alternate window station for the renderer. const char kDisableAltWinstation[] = "disable-winsta"; @@ -174,6 +178,9 @@ const char kDisableDevTools[] = "disable-dev-tools"; // Disables device orientation events. const char kDisableDeviceOrientation[] = "disable-device-orientation"; +// Disable experimental WebGL support. +const char kDisableExperimentalWebGL[] = "disable-webgl"; + // Disable extensions. const char kDisableExtensions[] = "disable-extensions"; @@ -340,9 +347,6 @@ const char kDumpHistogramsOnExit[] = "dump-histograms-on-exit"; // Enable displaying net log events on the command line. extern const char kLogNetLog[] = "log-net-log"; -// Enable gpu-accelerated compositing. -const char kEnableAcceleratedCompositing[] = "enable-accelerated-compositing"; - // Enable gpu-accelerated 2d canvas. const char kEnableAccelerated2dCanvas[] = "enable-accelerated-2d-canvas"; @@ -393,9 +397,6 @@ const char kEnableDNSSECCerts[] = "enable-dnssec-certs"; const char kEnableExperimentalExtensionApis[] = "enable-experimental-extension-apis"; -// Enable experimental WebGL support. -const char kEnableExperimentalWebGL[] = "enable-webgl"; - // Enable experimental timeline API. const char kEnableExtensionTimelineApi[] = "enable-extension-timeline-api"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index 74bec36..82417c4 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -47,6 +47,7 @@ extern const char kCloudPrintServiceURL[]; extern const char kCountry[]; extern const char kDebugPrint[]; extern const char kDiagnostics[]; +extern const char kDisableAcceleratedCompositing[]; extern const char kDisableAltWinstation[]; extern const char kDisableApplicationCache[]; extern const char kDisableApps[]; @@ -62,6 +63,7 @@ extern const char kDisableDatabases[]; extern const char kDisableDesktopNotifications[]; extern const char kDisableDevTools[]; extern const char kDisableDeviceOrientation[]; +extern const char kDisableExperimentalWebGL[]; extern const char kDisableExtensions[]; extern const char kDisableExtensionsFileAccessCheck[]; extern const char kDisableGeolocation[]; @@ -108,7 +110,6 @@ extern const char kDnsLogDetails[]; extern const char kDnsPrefetchDisable[]; extern const char kDomAutomationController[]; extern const char kDumpHistogramsOnExit[]; -extern const char kEnableAcceleratedCompositing[]; extern const char kEnableAccelerated2dCanvas[]; extern const char kEnableAeroPeekTabs[]; extern const char kEnableAuthNegotiatePort[]; @@ -123,7 +124,6 @@ extern const char kEnableCookiePrompt[]; extern const char kEnableDeviceMotion[]; extern const char kEnableDNSSECCerts[]; extern const char kEnableExperimentalExtensionApis[]; -extern const char kEnableExperimentalWebGL[]; extern const char kEnableExtensionTimelineApi[]; extern const char kEnableFastback[]; extern const char kEnableFileCookies[]; diff --git a/chrome/common/sandbox_init_wrapper_mac.cc b/chrome/common/sandbox_init_wrapper_mac.cc index d3017b7..ca21255 100644 --- a/chrome/common/sandbox_init_wrapper_mac.cc +++ b/chrome/common/sandbox_init_wrapper_mac.cc @@ -22,7 +22,7 @@ bool SandboxInitWrapper::InitializeSandbox(const CommandLine& command_line, // Browser process isn't sandboxed. return true; } else if (process_type == switches::kRendererProcess) { - if (command_line.HasSwitch(switches::kEnableExperimentalWebGL) && + if (!command_line.HasSwitch(switches::kDisableExperimentalWebGL) && command_line.HasSwitch(switches::kInProcessWebGL)) { // TODO(kbr): this check seems to be necessary only on this // platform because the sandbox is initialized later. Remove diff --git a/chrome/common/sandbox_policy.cc b/chrome/common/sandbox_policy.cc index e772fc9..dd9996c 100644 --- a/chrome/common/sandbox_policy.cc +++ b/chrome/common/sandbox_policy.cc @@ -460,7 +460,7 @@ base::ProcessHandle StartProcessWithAccess(CommandLine* cmd_line, in_sandbox = false; } #endif - if (browser_command_line.HasSwitch(switches::kEnableExperimentalWebGL) && + if (!browser_command_line.HasSwitch(switches::kDisableExperimentalWebGL) && browser_command_line.HasSwitch(switches::kInProcessWebGL)) { // In process WebGL won't work if the sandbox is enabled. in_sandbox = false; diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc index 9aad4dc..edbe0c9 100644 --- a/chrome/renderer/render_thread.cc +++ b/chrome/renderer/render_thread.cc @@ -945,7 +945,7 @@ void RenderThread::EnsureWebKitInitialized() { !command_line.HasSwitch(switches::kDisableGeolocation)); WebRuntimeFeatures::enableWebGL( - command_line.HasSwitch(switches::kEnableExperimentalWebGL)); + !command_line.HasSwitch(switches::kDisableExperimentalWebGL)); WebRuntimeFeatures::enablePushState(true); diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 065b691..a39a63f 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -2440,7 +2440,7 @@ WebMediaPlayer* RenderView::createMediaPlayer( // to create a factory for FFmpegVideoDecoder here so that it can use // the Gles2VideoDecodeContext. if (cmd_line->HasSwitch(switches::kEnableAcceleratedDecoding) && - cmd_line->HasSwitch(switches::kEnableAcceleratedCompositing)) { + !cmd_line->HasSwitch(switches::kDisableAcceleratedCompositing)) { // Add the hardware video decoder factory. factory->AddFactory(IpcVideoDecoder::CreateFactory( MessageLoop::current(), diff --git a/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc b/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc index 0c7d966..9a57aa8 100644 --- a/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc +++ b/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc @@ -40,8 +40,8 @@ WebGraphicsContext3DCommandBufferImpl:: bool WebGraphicsContext3DCommandBufferImpl::initialize( WebGraphicsContext3D::Attributes attributes, WebKit::WebView* web_view) { - bool compositing_enabled = CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableAcceleratedCompositing); + bool compositing_enabled = !CommandLine::ForCurrentProcess()->HasSwitch( + switches::kDisableAcceleratedCompositing); ggl::Context* parent_context = NULL; // If GPU compositing is enabled we need to create a GL context that shares // resources with the compositor's context. |