From 1e7b565652875f8f16e5211d1fecaed17efe26e1 Mon Sep 17 00:00:00 2001 From: "apatrick@chromium.org" Date: Fri, 6 Aug 2010 23:18:23 +0000 Subject: 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 --- webkit/glue/webpreferences.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'webkit') 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. -- cgit v1.1