diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-06 23:18:23 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-06 23:18:23 +0000 |
| commit | 1e7b565652875f8f16e5211d1fecaed17efe26e1 (patch) | |
| tree | 28274f75e8625d62e037c36d819fc72f7a3c5662 /webkit/glue/webpreferences.cc | |
| parent | dc7269d52ff9a8bec724f8548f93e7019ebbbabd (diff) | |
| download | chromium_src-1e7b565652875f8f16e5211d1fecaed17efe26e1.zip chromium_src-1e7b565652875f8f16e5211d1fecaed17efe26e1.tar.gz chromium_src-1e7b565652875f8f16e5211d1fecaed17efe26e1.tar.bz2 | |
WebGL web preferences do not disable WebGL if already enabled.
This means WebGL is enabled in the test shell.
TEST=try, layout tests
BUG=none
Review URL: http://codereview.chromium.org/3047051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55313 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webpreferences.cc')
| -rw-r--r-- | webkit/glue/webpreferences.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc index b8229a5..b831bab 100644 --- a/webkit/glue/webpreferences.cc +++ b/webkit/glue/webpreferences.cc @@ -87,7 +87,8 @@ void WebPreferences::Apply(WebView* web_view) const { // Enable experimental WebGL support if requested on command line // and support is compiled in. - settings->setExperimentalWebGLEnabled(experimental_webgl_enabled); + settings->setExperimentalWebGLEnabled( + WebRuntimeFeatures::isWebGLEnabled() || experimental_webgl_enabled); // Display colored borders around composited render layers if requested // on command line. |