Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / cc / debug / layer_tree_debug_state.cc

diff --git a/src/cc/debug/layer_tree_debug_state.cc b/src/cc/debug/layer_tree_debug_state.cc
index 95245e0..d89bca3 100644 (file)
--- a/src/cc/debug/layer_tree_debug_state.cc
+++ b/src/cc/debug/layer_tree_debug_state.cc
@@ -22,6 +22,7 @@ LayerTreeDebugState::LayerTreeDebugState()
       show_non_occluding_rects(false),
       show_touch_event_handler_rects(false),
       show_wheel_event_handler_rects(false),
+      show_scroll_event_handler_rects(false),
       show_non_fast_scrollable_rects(false),
       show_layer_animation_bounds_rects(false),
       slow_down_raster_scale_factor(0),
@@ -49,8 +50,8 @@ bool LayerTreeDebugState::ShowHudRects() const {
          show_surface_damage_rects || show_screen_space_rects ||
          show_replica_screen_space_rects || show_occluding_rects ||
          show_non_occluding_rects || show_touch_event_handler_rects ||
-         show_wheel_event_handler_rects || show_non_fast_scrollable_rects ||
-         show_layer_animation_bounds_rects;
+         show_wheel_event_handler_rects || show_scroll_event_handler_rects ||
+         show_non_fast_scrollable_rects || show_layer_animation_bounds_rects;
 }
 
 bool LayerTreeDebugState::ShowMemoryStats() const {
@@ -59,30 +60,27 @@ bool LayerTreeDebugState::ShowMemoryStats() const {
 
 bool LayerTreeDebugState::Equal(const LayerTreeDebugState& a,
                                 const LayerTreeDebugState& b) {
-  return (a.show_fps_counter == b.show_fps_counter &&
-          a.show_debug_borders == b.show_debug_borders &&
-          a.continuous_painting == b.continuous_painting &&
-          a.show_paint_rects == b.show_paint_rects &&
-          a.show_property_changed_rects == b.show_property_changed_rects &&
-          a.show_surface_damage_rects == b.show_surface_damage_rects &&
-          a.show_screen_space_rects == b.show_screen_space_rects &&
-          a.show_replica_screen_space_rects ==
-          b.show_replica_screen_space_rects &&
-          a.show_occluding_rects == b.show_occluding_rects &&
-          a.show_non_occluding_rects == b.show_non_occluding_rects &&
-          a.show_touch_event_handler_rects ==
-          b.show_touch_event_handler_rects &&
-          a.show_wheel_event_handler_rects ==
-          b.show_wheel_event_handler_rects &&
-          a.show_non_fast_scrollable_rects ==
-          b.show_non_fast_scrollable_rects &&
-          a.show_layer_animation_bounds_rects ==
+  return (
+      a.show_fps_counter == b.show_fps_counter &&
+      a.show_debug_borders == b.show_debug_borders &&
+      a.continuous_painting == b.continuous_painting &&
+      a.show_paint_rects == b.show_paint_rects &&
+      a.show_property_changed_rects == b.show_property_changed_rects &&
+      a.show_surface_damage_rects == b.show_surface_damage_rects &&
+      a.show_screen_space_rects == b.show_screen_space_rects &&
+      a.show_replica_screen_space_rects == b.show_replica_screen_space_rects &&
+      a.show_occluding_rects == b.show_occluding_rects &&
+      a.show_non_occluding_rects == b.show_non_occluding_rects &&
+      a.show_touch_event_handler_rects == b.show_touch_event_handler_rects &&
+      a.show_wheel_event_handler_rects == b.show_wheel_event_handler_rects &&
+      a.show_scroll_event_handler_rects == b.show_scroll_event_handler_rects &&
+      a.show_non_fast_scrollable_rects == b.show_non_fast_scrollable_rects &&
+      a.show_layer_animation_bounds_rects ==
           b.show_layer_animation_bounds_rects &&
-          a.slow_down_raster_scale_factor == b.slow_down_raster_scale_factor &&
-          a.rasterize_only_visible_content ==
-          b.rasterize_only_visible_content &&
-          a.show_picture_borders == b.show_picture_borders &&
-          a.record_rendering_stats_ == b.record_rendering_stats_);
+      a.slow_down_raster_scale_factor == b.slow_down_raster_scale_factor &&
+      a.rasterize_only_visible_content == b.rasterize_only_visible_content &&
+      a.show_picture_borders == b.show_picture_borders &&
+      a.record_rendering_stats_ == b.record_rendering_stats_);
 }
 
 LayerTreeDebugState LayerTreeDebugState::Unite(const LayerTreeDebugState& a,
@@ -102,6 +100,7 @@ LayerTreeDebugState LayerTreeDebugState::Unite(const LayerTreeDebugState& a,
   r.show_non_occluding_rects |= b.show_non_occluding_rects;
   r.show_touch_event_handler_rects |= b.show_touch_event_handler_rects;
   r.show_wheel_event_handler_rects |= b.show_wheel_event_handler_rects;
+  r.show_scroll_event_handler_rects |= b.show_scroll_event_handler_rects;
   r.show_non_fast_scrollable_rects |= b.show_non_fast_scrollable_rects;
   r.show_layer_animation_bounds_rects |= b.show_layer_animation_bounds_rects;