diff options
Diffstat (limited to 'chromium/webkit/common/webpreferences.h')
| -rw-r--r-- | chromium/webkit/common/webpreferences.h | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/chromium/webkit/common/webpreferences.h b/chromium/webkit/common/webpreferences.h index 6e689d1a730..241fde36a26 100644 --- a/chromium/webkit/common/webpreferences.h +++ b/chromium/webkit/common/webpreferences.h @@ -16,6 +16,7 @@ #include <vector> #include "base/strings/string16.h" +#include "net/base/network_change_notifier.h" #include "url/gurl.h" #include "webkit/common/webkit_common_export.h" @@ -38,7 +39,8 @@ enum EditingBehavior { EDITING_BEHAVIOR_MAC, EDITING_BEHAVIOR_WIN, EDITING_BEHAVIOR_UNIX, - EDITING_BEHAVIOR_ANDROID + EDITING_BEHAVIOR_ANDROID, + EDITING_BEHAVIOR_LAST = EDITING_BEHAVIOR_ANDROID }; @@ -91,56 +93,44 @@ struct WEBKIT_COMMON_EXPORT WebPreferences { bool caret_browsing_enabled; bool hyperlink_auditing_enabled; bool is_online; + net::NetworkChangeNotifier::ConnectionType connection_type; bool allow_universal_access_from_file_urls; bool allow_file_access_from_file_urls; bool webaudio_enabled; bool experimental_webgl_enabled; + bool pepper_3d_enabled; bool flash_3d_enabled; bool flash_stage3d_enabled; bool flash_stage3d_baseline_enabled; bool gl_multisampling_enabled; bool privileged_webgl_extensions_enabled; bool webgl_errors_to_console_enabled; - bool accelerated_compositing_for_overflow_scroll_enabled; - bool universal_accelerated_compositing_for_overflow_scroll_enabled; - bool accelerated_compositing_for_scrollable_frames_enabled; - bool composited_scrolling_for_frames_enabled; bool mock_scrollbars_enabled; bool layer_squashing_enabled; - bool threaded_html_parser; - bool show_paint_rects; bool asynchronous_spell_checking_enabled; bool unified_textchecker_enabled; - bool accelerated_compositing_enabled; - bool force_compositing_mode; - bool accelerated_compositing_for_3d_transforms_enabled; - bool accelerated_compositing_for_animation_enabled; bool accelerated_compositing_for_video_enabled; bool accelerated_2d_canvas_enabled; int minimum_accelerated_2d_canvas_size; bool antialiased_2d_canvas_disabled; int accelerated_2d_canvas_msaa_sample_count; bool accelerated_filters_enabled; + bool deferred_filters_enabled; + bool container_culling_enabled; bool gesture_tap_highlight_enabled; - bool accelerated_compositing_for_plugins_enabled; - bool memory_info_enabled; - bool fullscreen_enabled; bool allow_displaying_insecure_content; bool allow_running_insecure_content; bool password_echo_enabled; bool should_print_backgrounds; bool should_clear_document_background; bool enable_scroll_animator; - bool visual_word_movement_enabled; bool css_variables_enabled; - bool lazy_layout_enabled; bool region_based_columns_enabled; bool touch_enabled; bool device_supports_touch; bool device_supports_mouse; bool touch_adjustment_enabled; int pointer_events_max_touch_points; - bool fixed_position_creates_stacking_context; bool sync_xhr_in_documents_enabled; bool deferred_image_decoding_enabled; bool should_respect_image_orientation; @@ -153,11 +143,11 @@ struct WEBKIT_COMMON_EXPORT WebPreferences { bool initialize_at_minimum_page_scale; bool smart_insert_delete_enabled; bool spatial_navigation_enabled; - bool experimental_websocket_enabled; bool pinch_virtual_viewport_enabled; int pinch_overlay_scrollbar_thickness; bool use_solid_color_scrollbars; bool compositor_touch_hit_testing; + bool navigate_on_drag_drop; // This flags corresponds to a Page's Settings' setCookieEnabled state. It // only controls whether or not the "document.cookie" field is properly @@ -166,6 +156,10 @@ struct WEBKIT_COMMON_EXPORT WebPreferences { // without raising a DOM security exception. bool cookie_enabled; + // This flag indicates whether H/W accelerated video decode is enabled for + // pepper plugins. Defaults to false. + bool pepper_accelerated_video_decode_enabled; + #if defined(OS_ANDROID) bool text_autosizing_enabled; float font_scale_factor; @@ -173,7 +167,6 @@ struct WEBKIT_COMMON_EXPORT WebPreferences { bool force_enable_zoom; bool double_tap_to_zoom_enabled; bool user_gesture_required_for_media_playback; - bool user_gesture_required_for_media_fullscreen; GURL default_video_poster_url; bool support_deprecated_target_density_dpi; bool use_legacy_background_size_shorthand_behavior; |