diff options
| author | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-23 19:07:29 +0000 |
|---|---|---|
| committer | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-23 19:07:29 +0000 |
| commit | 250ff7b97e979172fd88ab1b01d24579eb115c89 (patch) | |
| tree | ce1e47d7bf9a4c6227ec0003df896ebd6153b6d2 /webkit/glue/webpreferences.cc | |
| parent | bf7ab1a183cd3259f8f01df8c68698771f16ceca (diff) | |
| download | chromium_src-250ff7b97e979172fd88ab1b01d24579eb115c89.zip chromium_src-250ff7b97e979172fd88ab1b01d24579eb115c89.tar.gz chromium_src-250ff7b97e979172fd88ab1b01d24579eb115c89.tar.bz2 | |
If --disable-webgl is passed, continue to return null from
Canvas.getContext("webgl"), but leave WebGLRenderingContext and
related properties on the DOMWindow. Blacklisting of certain GPUs is
resulting in reports that the browser doesn't support WebGL, when in
reality only the graphics card doesn't.
An upstream WebKit patch will follow this one removing the WebGL
switch from WebRuntimeFeatures and removing the EnabledAtRuntime
extended attribute from these properties.
BUG=77110
TEST=none (verified manually)
R=tony@chromium.org,darin@chromium.org,arv@chromium.org
Review URL: http://codereview.chromium.org/6705015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79160 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webpreferences.cc')
| -rw-r--r-- | webkit/glue/webpreferences.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc index 116d43d..e54c199 100644 --- a/webkit/glue/webpreferences.cc +++ b/webkit/glue/webpreferences.cc @@ -155,9 +155,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; - settings->setExperimentalWebGLEnabled(enable_webgl); + settings->setExperimentalWebGLEnabled(experimental_webgl_enabled); // Disable GL multisampling if requested on command line. settings->setOpenGLMultisamplingEnabled(gl_multisampling_enabled); @@ -200,7 +198,7 @@ void WebPreferences::Apply(WebView* web_view) const { // WebGL and accelerated 2D canvas are always gpu composited. settings->setAcceleratedCompositingForCanvasEnabled( - enable_webgl || accelerated_2d_canvas_enabled); + experimental_webgl_enabled || accelerated_2d_canvas_enabled); // Enable memory info reporting to page if requested on the command line. settings->setMemoryInfoEnabled(memory_info_enabled); |