diff options
| author | jbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-04 22:57:19 +0000 |
|---|---|---|
| committer | jbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-04 22:57:19 +0000 |
| commit | e0d8c4278bea8648d5441eac5970e6d75fa9f088 (patch) | |
| tree | d3bac022fea9fa038d35ecbbafee339d29788762 /webkit | |
| parent | 18165d744e7e9f1d31591a4c3d5b500a9a5cddd1 (diff) | |
| download | chromium_src-e0d8c4278bea8648d5441eac5970e6d75fa9f088.zip chromium_src-e0d8c4278bea8648d5441eac5970e6d75fa9f088.tar.gz chromium_src-e0d8c4278bea8648d5441eac5970e6d75fa9f088.tar.bz2 | |
Connect up flash blacklist entries to GetSettingInt
This allows us to blacklist flash 3d and stage3d separately.
BUG=129847
TEST=
Review URL: https://chromiumcodereview.appspot.com/10501006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140414 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/webpreferences.cc | 2 | ||||
| -rw-r--r-- | webkit/glue/webpreferences.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc index ed089f7..99bb7bf 100644 --- a/webkit/glue/webpreferences.cc +++ b/webkit/glue/webpreferences.cc @@ -72,6 +72,8 @@ WebPreferences::WebPreferences() allow_file_access_from_file_urls(false), webaudio_enabled(false), experimental_webgl_enabled(false), + flash_3d_enabled(true), + flash_stage3d_enabled(false), gl_multisampling_enabled(true), privileged_webgl_extensions_enabled(false), webgl_errors_to_console_enabled(true), diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h index bdc324b..a17d5c0 100644 --- a/webkit/glue/webpreferences.h +++ b/webkit/glue/webpreferences.h @@ -88,6 +88,8 @@ struct WEBKIT_GLUE_EXPORT WebPreferences { bool allow_file_access_from_file_urls; bool webaudio_enabled; bool experimental_webgl_enabled; + bool flash_3d_enabled; + bool flash_stage3d_enabled; bool gl_multisampling_enabled; bool privileged_webgl_extensions_enabled; bool webgl_errors_to_console_enabled; |