summaryrefslogtreecommitdiffstats
path: root/chrome/worker
diff options
context:
space:
mode:
authorchase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-20 21:54:58 +0000
committerchase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-20 21:54:58 +0000
commit9fec137c83b849a57c6a5a712303cfc6eb0bd5fe (patch)
tree4380deb3deaffd5988d25b09da5100336f5d8772 /chrome/worker
parent398d1a99e87fb3f57f6330616f5aa1fd494faced (diff)
downloadchromium_src-9fec137c83b849a57c6a5a712303cfc6eb0bd5fe.zip
chromium_src-9fec137c83b849a57c6a5a712303cfc6eb0bd5fe.tar.gz
chromium_src-9fec137c83b849a57c6a5a712303cfc6eb0bd5fe.tar.bz2
Revert 69753 - Added group policy for disabling all client-side 3D APIs in Chromium
(in particular, WebGL and Pepper 3D). This has been hooked up through a new command-line argument (--disable-3d-apis) orthogonal to the existing ones, so that further changes to those command line arguments will not accidentally regress the group policy support. Tested in the following ways: - Verified that --disable-3d-apis disables WebGL and Pepper 3D support on Mac OS X. - Verified that specifying the Disable3DAPIs policy via a JSON file disables WebGL on Linux. - Ran unit_tests and verified that there were no failures introduced. BUG=64806 TEST=ConfigurationPolicyPrefStoreBooleanTest Review URL: http://codereview.chromium.org/5991003 TBR=kbr@chromium.org Review URL: http://codereview.chromium.org/6027004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69759 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/worker')
-rw-r--r--chrome/worker/worker_thread.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/chrome/worker/worker_thread.cc b/chrome/worker/worker_thread.cc
index cafd482..1f5bccd 100644
--- a/chrome/worker/worker_thread.cc
+++ b/chrome/worker/worker_thread.cc
@@ -60,7 +60,6 @@ WorkerThread::WorkerThread() {
!command_line.HasSwitch(switches::kDisableFileSystem));
WebRuntimeFeatures::enableWebGL(
- !command_line.HasSwitch(switches::kDisable3DAPIs) &&
!command_line.HasSwitch(switches::kDisableExperimentalWebGL));
}