Merge Chromium at 7.0.540.0 : Initial merge by git

Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used.

Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15

1 files changed, 6 insertions, 2 deletions

diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h
index 3e4f926..bc6d477 100644
--- a/webkit/glue/webpreferences.h
+++ b/webkit/glue/webpreferences.h
@@ -55,6 +55,8 @@ struct WebPreferences {
   bool databases_enabled;
   bool application_cache_enabled;
   bool tabs_to_links;
+  bool caret_browsing_enabled;
+  bool hyperlink_auditing_enabled;
 
   bool user_style_sheet_enabled;
   GURL user_style_sheet_location;
@@ -64,7 +66,7 @@ struct WebPreferences {
   bool experimental_webgl_enabled;
   bool show_composited_layer_borders;
   bool accelerated_compositing_enabled;
-  bool enable_html5_parser;
+  bool accelerated_2d_canvas_enabled;
   bool memory_info_enabled;
 
   // We try to keep the default values the same as the default values in
@@ -103,6 +105,8 @@ struct WebPreferences {
         databases_enabled(false),
         application_cache_enabled(false),
         tabs_to_links(true),
+        caret_browsing_enabled(false),
+        hyperlink_auditing_enabled(false),
         user_style_sheet_enabled(false),
         author_and_user_styles_enabled(true),
         allow_universal_access_from_file_urls(false),
@@ -110,7 +114,7 @@ struct WebPreferences {
         experimental_webgl_enabled(false),
         show_composited_layer_borders(false),
         accelerated_compositing_enabled(false),
-        enable_html5_parser(true),
+        accelerated_2d_canvas_enabled(false),
         memory_info_enabled(false) {
   }