summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webpreferences.h
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2011-06-09 11:47:42 +0100
committerKristian Monsen <kristianm@google.com>2011-06-29 14:33:03 +0100
commitdc0f95d653279beabeb9817299e2902918ba123e (patch)
tree32eb121cd532053a5b9cb0c390331349af8d6baa /webkit/glue/webpreferences.h
parentba160cd4054d13d0cb0b1b46e61c3bed67095811 (diff)
downloadexternal_chromium-dc0f95d653279beabeb9817299e2902918ba123e.zip
external_chromium-dc0f95d653279beabeb9817299e2902918ba123e.tar.gz
external_chromium-dc0f95d653279beabeb9817299e2902918ba123e.tar.bz2
Merge Chromium at r11.0.696.0: Initial merge by git
Change-Id: I273dde2843af0839dfc08b419bb443fbd449532d
Diffstat (limited to 'webkit/glue/webpreferences.h')
-rw-r--r--webkit/glue/webpreferences.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h
index 468e9b4..0d37d39 100644
--- a/webkit/glue/webpreferences.h
+++ b/webkit/glue/webpreferences.h
@@ -70,13 +70,18 @@ struct WebPreferences {
bool experimental_webgl_enabled;
bool gl_multisampling_enabled;
bool show_composited_layer_borders;
+ bool show_composited_layer_tree;
+ bool show_fps_counter;
+ bool asynchronous_spell_checking_enabled;
bool accelerated_compositing_enabled;
+ bool composite_to_texture_enabled;
bool accelerated_layers_enabled;
bool accelerated_video_enabled;
bool accelerated_2d_canvas_enabled;
bool accelerated_plugins_enabled;
bool memory_info_enabled;
bool interactive_form_validation_enabled;
+ bool fullscreen_enabled;
// We try to keep the default values the same as the default values in
// chrome, except for the cases where it would require lots of extra work for