Pointer/hover media query support: platform-independent changes

content/public/common/web_preferences.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/common/web_preferences.h"
 
 #include "base/basictypes.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "third_party/WebKit/public/web/WebSettings.h"
@@ skipping 34 matching lines @@
 COMPILE_ASSERT_MATCHING_ENUMS(
     V8_SCRIPT_STREAMING_MODE_ONLY_ASYNC_AND_DEFER,
     WebSettings::V8ScriptStreamingModeOnlyAsyncAndDefer);
 COMPILE_ASSERT_MATCHING_ENUMS(
     V8_SCRIPT_STREAMING_MODE_ALL_PLUS_BLOCK_PARSER_BLOCKING,
     WebSettings::V8ScriptStreamingModeAllPlusBlockParsingBlocking);
 COMPILE_ASSERT_MATCHING_ENUMS(
     V8_SCRIPT_STREAMING_MODE_LAST,
     WebSettings::V8ScriptStreamingModeAllPlusBlockParsingBlocking);
 
+COMPILE_ASSERT_MATCHING_ENUMS(ui::PointerTypeNone,

[mustaq, 2014/11/11 15:41:41]

Not sure what's the best place for these checks. Any suggestion?

+                              WebSettings::PointerTypeNone);
+COMPILE_ASSERT_MATCHING_ENUMS(ui::PointerTypeCoarse,
+                              WebSettings::PointerTypeCoarse);
+COMPILE_ASSERT_MATCHING_ENUMS(ui::PointerTypeFine,
+                              WebSettings::PointerTypeFine);
+
+COMPILE_ASSERT_MATCHING_ENUMS(ui::HoverTypeNone,
+                              WebSettings::HoverTypeNone);
+COMPILE_ASSERT_MATCHING_ENUMS(ui::HoverTypeOnDemand,
+                              WebSettings::HoverTypeOnDemand);
+COMPILE_ASSERT_MATCHING_ENUMS(ui::HoverTypeHover,
+                              WebSettings::HoverTypeHover);
+
 WebPreferences::WebPreferences()
     : default_font_size(16),
       default_fixed_font_size(13),
       minimum_font_size(0),
       minimum_logical_font_size(6),
       default_encoding("ISO-8859-1"),
       javascript_enabled(true),
       web_security_enabled(true),
       javascript_can_open_windows_automatically(true),
       loads_images_automatically(true),
@@ skipping 47 matching lines @@
       password_echo_enabled(false),
       should_print_backgrounds(false),
       should_clear_document_background(true),
       enable_scroll_animator(false),
       region_based_columns_enabled(false),
       touch_enabled(false),
       device_supports_touch(false),
       device_supports_mouse(true),
       touch_adjustment_enabled(true),
       pointer_events_max_touch_points(0),
+      available_pointer_types(0),
+      primary_pointer_type(ui::PointerTypeNone),
+      available_hover_types(0),
+      primary_hover_type(ui::HoverTypeNone),
       sync_xhr_in_documents_enabled(true),
       deferred_image_decoding_enabled(false),
       image_color_profiles_enabled(false),
       should_respect_image_orientation(false),
       number_of_cpu_cores(1),
 #if defined(OS_MACOSX)
       editing_behavior(EDITING_BEHAVIOR_MAC),
 #elif defined(OS_WIN)
       editing_behavior(EDITING_BEHAVIOR_WIN),
 #elif defined(OS_ANDROID)
@@ skipping 55 matching lines @@
   cursive_font_family_map[kCommonScript] = base::ASCIIToUTF16("Script");
   fantasy_font_family_map[kCommonScript] = base::ASCIIToUTF16("Impact");
   pictograph_font_family_map[kCommonScript] =
       base::ASCIIToUTF16("Times New Roman");
 }
 
 WebPreferences::~WebPreferences() {
 }
 
 }  // namespace content