summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webpreferences.cc
diff options
context:
space:
mode:
authorjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-03 02:05:47 +0000
committerjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-03 02:05:47 +0000
commit01917bd769d01d583eed74ed29bb6f23981a878e (patch)
tree580152b5e6cfbe686a8ce847520d09064b964d80 /webkit/glue/webpreferences.cc
parentc6352e9ebc6baa5f8e1e50b2b26b9b5d625bffc4 (diff)
downloadchromium_src-01917bd769d01d583eed74ed29bb6f23981a878e.zip
chromium_src-01917bd769d01d583eed74ed29bb6f23981a878e.tar.gz
chromium_src-01917bd769d01d583eed74ed29bb6f23981a878e.tar.bz2
Turn GPU accelerated features (WebGL, compositing, accelerated 2d canvas) off for background pages
We don't support turning compositing on for a background page currently and it doesn't seem necessary. This disables all GPU-requiring features for background pages for now. When we have valid use cases we can re-enable features as needed. BUG=64512 TEST=load extension that uses 3d CSS in a background page and verify that there is no browser crash or GPU process created on startup Review URL: http://codereview.chromium.org/5369008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68130 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webpreferences.cc')
-rw-r--r--webkit/glue/webpreferences.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc
index afc39bd..c6c32e7 100644
--- a/webkit/glue/webpreferences.cc
+++ b/webkit/glue/webpreferences.cc
@@ -142,7 +142,7 @@ void WebPreferences::Apply(WebView* web_view) const {
// Enable experimental WebGL support if requested on command line
// and support is compiled in.
bool enable_webgl =
- WebRuntimeFeatures::isWebGLEnabled() || experimental_webgl_enabled;
+ WebRuntimeFeatures::isWebGLEnabled() && experimental_webgl_enabled;
settings->setExperimentalWebGLEnabled(enable_webgl);
// Display colored borders around composited render layers if requested