summaryrefslogtreecommitdiffstats
path: root/chrome/renderer
diff options
context:
space:
mode:
authorkbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-16 01:03:27 +0000
committerkbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-16 01:03:27 +0000
commit2e0ad4ae783113c1109b5c98fe4104a220c0b839 (patch)
tree98985e5e3d91420c3e16ab1bc0bea44d34578e6f /chrome/renderer
parentdbc13b5d232666808a29e0e787883f06082282fd (diff)
downloadchromium_src-2e0ad4ae783113c1109b5c98fe4104a220c0b839.zip
chromium_src-2e0ad4ae783113c1109b5c98fe4104a220c0b839.tar.gz
chromium_src-2e0ad4ae783113c1109b5c98fe4104a220c0b839.tar.bz2
Added --in-process-webgl command line argument to select the WebGL
implementation which runs in process rather than making the decision based on the presence of --no-sandbox. Made this argument implicitly disable the sandbox. Added it as an unsupported command line argument so it pops up the infobar. BUG=39721 TEST=ran WebGL demos on Mac and Windows with and without --in-process-webgl Review URL: http://codereview.chromium.org/1599034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44729 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
-rw-r--r--chrome/renderer/renderer_webkitclient_impl.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc
index c5b042a..ec34479 100644
--- a/chrome/renderer/renderer_webkitclient_impl.cc
+++ b/chrome/renderer/renderer_webkitclient_impl.cc
@@ -296,10 +296,8 @@ RendererWebKitClientImpl::sharedWorkerRepository() {
WebKit::WebGraphicsContext3D*
RendererWebKitClientImpl::createGraphicsContext3D() {
// TODO(kbr): remove the WebGraphicsContext3D::createDefault code path
- // completely, and at least for a period of time, either pop up a warning
- // dialog, or don't even start the browser, if WebGL is enabled and the
- // sandbox isn't.
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoSandbox)) {
+ // completely.
+ if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kInProcessWebGL)) {
return WebKit::WebGraphicsContext3D::createDefault();
} else {
#if defined(ENABLE_GPU)