diff options
author | zmo@google.com <zmo@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-22 00:40:31 +0000 |
---|---|---|
committer | zmo@google.com <zmo@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-22 00:40:31 +0000 |
commit | d34dbf2e0870d82bb70490f8d0a4e70046a7d15e (patch) | |
tree | 533a172fe677de973ec38b7a6fda93badf76d232 /webkit | |
parent | b889b277b99867b6bb4a1021dc9153b2952a3e75 (diff) | |
download | chromium_src-d34dbf2e0870d82bb70490f8d0a4e70046a7d15e.zip chromium_src-d34dbf2e0870d82bb70490f8d0a4e70046a7d15e.tar.gz chromium_src-d34dbf2e0870d82bb70490f8d0a4e70046a7d15e.tar.bz2 |
Enable privileged WebGL extensions for Chrome extensions.
Also, these WebGL extensions can be enabled through a commandline switch: enable-privileged-webgl-extensions.
BUG=95531
TEST=two WebGL conformance tests run through the extension-enabled path
Review URL: http://codereview.chromium.org/8364018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106820 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r-- | webkit/glue/webpreferences.cc | 6 | ||||
-rw-r--r-- | webkit/glue/webpreferences.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc index a554137..cdaf527b 100644 --- a/webkit/glue/webpreferences.cc +++ b/webkit/glue/webpreferences.cc @@ -69,6 +69,7 @@ WebPreferences::WebPreferences() webaudio_enabled(false), experimental_webgl_enabled(false), gl_multisampling_enabled(true), + privileged_webgl_extensions_enabled(false), show_composited_layer_borders(false), show_composited_layer_tree(false), show_fps_counter(false), @@ -236,6 +237,11 @@ void WebPreferences::Apply(WebView* web_view) const { // Disable GL multisampling if requested on command line. settings->setOpenGLMultisamplingEnabled(gl_multisampling_enabled); + // Enable privileged WebGL extensions for Chrome extensions or if requested + // on command line. + settings->setPrivilegedWebGLExtensionsEnabled( + privileged_webgl_extensions_enabled); + // Display colored borders around composited render layers if requested // on command line. settings->setShowDebugBorders(show_composited_layer_borders); diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h index 6634c1d..95f288a 100644 --- a/webkit/glue/webpreferences.h +++ b/webkit/glue/webpreferences.h @@ -83,6 +83,7 @@ struct WebPreferences { bool webaudio_enabled; bool experimental_webgl_enabled; bool gl_multisampling_enabled; + bool privileged_webgl_extensions_enabled; bool show_composited_layer_borders; bool show_composited_layer_tree; bool show_fps_counter; |