Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / cc / trees / layer_tree_settings.h

diff --git a/src/cc/trees/layer_tree_settings.h b/src/cc/trees/layer_tree_settings.h
index ecafb8f..8192b3d 100644 (file)
--- a/src/cc/trees/layer_tree_settings.h
+++ b/src/cc/trees/layer_tree_settings.h
@@ -21,21 +21,24 @@ class CC_EXPORT LayerTreeSettings {
   bool impl_side_painting;
   bool allow_antialiasing;
   bool throttle_frame_production;
-  bool begin_impl_frame_scheduling_enabled;
+  bool begin_frame_scheduling_enabled;
   bool main_frame_before_draw_enabled;
   bool main_frame_before_activation_enabled;
   bool using_synchronous_renderer_compositor;
+  bool report_overscroll_only_for_scrollable_axes;
   bool per_tile_painting_enabled;
   bool partial_swap_enabled;
   bool accelerated_animation_enabled;
   bool can_use_lcd_text;
+  bool use_distance_field_text;
   bool should_clear_root_render_pass;
-  enum RasterizationSite {
-    CpuRasterization,
-    HybridRasterization,
-    GpuRasterization,
+  bool gpu_rasterization_enabled;
+  bool gpu_rasterization_forced;
+  enum RecordingMode {
+    RecordNormally,
+    RecordWithSkRecord,
   };
-  RasterizationSite rasterization_site;
+  RecordingMode recording_mode;
   bool create_low_res_tiling;
 
   enum ScrollbarAnimator {
@@ -44,11 +47,10 @@ class CC_EXPORT LayerTreeSettings {
     Thinning,
   };
   ScrollbarAnimator scrollbar_animator;
-  int scrollbar_linear_fade_delay_ms;
-  int scrollbar_linear_fade_length_ms;
+  int scrollbar_fade_delay_ms;
+  int scrollbar_fade_duration_ms;
   SkColor solid_color_scrollbar_color;
   bool calculate_top_controls_position;
-  bool use_memory_management;
   bool timeout_and_draw_when_animation_checkerboards;
   int maximum_number_of_failed_draws_before_draw_is_forced_;
   bool layer_transforms_should_scale_layer_contents;
@@ -65,13 +67,14 @@ class CC_EXPORT LayerTreeSettings {
   bool use_pinch_zoom_scrollbars;
   bool use_pinch_virtual_viewport;
   size_t max_tiles_for_interest_area;
-  float skewport_target_time_in_seconds;
+  float skewport_target_time_multiplier;
   int skewport_extrapolation_limit_in_content_pixels;
   size_t max_unused_resource_memory_percentage;
   size_t max_memory_for_prepaint_percentage;
   int highp_threshold_min;
   bool strict_layer_property_change_checking;
-  bool use_map_image;
+  bool use_one_copy;
+  bool use_zero_copy;
   bool ignore_root_layer_flings;
   bool use_rgba_4444_textures;
   bool touch_hit_testing;