Upstream version 7.36.149.0

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

diff --git a/src/cc/trees/layer_tree_host_common.h b/src/cc/trees/layer_tree_host_common.h
index 29a3c66..5090c69 100644 (file)
--- a/src/cc/trees/layer_tree_host_common.h
+++ b/src/cc/trees/layer_tree_host_common.h
@@ -41,7 +41,8 @@ class CC_EXPORT LayerTreeHostCommon {
                         bool can_use_lcd_text,
                         bool can_render_to_separate_surface,
                         bool can_adjust_raster_scales,
-                        RenderSurfaceLayerListType* render_surface_layer_list)
+                        RenderSurfaceLayerListType* render_surface_layer_list,
+                        int current_render_surface_layer_list_id)
         : root_layer(root_layer),
           device_viewport_size(device_viewport_size),
           device_transform(device_transform),
@@ -52,7 +53,9 @@ class CC_EXPORT LayerTreeHostCommon {
           can_use_lcd_text(can_use_lcd_text),
           can_render_to_separate_surface(can_render_to_separate_surface),
           can_adjust_raster_scales(can_adjust_raster_scales),
-          render_surface_layer_list(render_surface_layer_list) {}
+          render_surface_layer_list(render_surface_layer_list),
+          current_render_surface_layer_list_id(
+              current_render_surface_layer_list_id) {}
 
     LayerType* root_layer;
     gfx::Size device_viewport_size;
@@ -65,6 +68,7 @@ class CC_EXPORT LayerTreeHostCommon {
     bool can_render_to_separate_surface;
     bool can_adjust_raster_scales;
     RenderSurfaceLayerListType* render_surface_layer_list;
+    int current_render_surface_layer_list_id;
   };
 
   template <typename LayerType, typename RenderSurfaceLayerListType>
@@ -96,6 +100,11 @@ class CC_EXPORT LayerTreeHostCommon {
   static void CalculateDrawProperties(CalcDrawPropsImplInputs* inputs);
 
   // Performs hit testing for a given render_surface_layer_list.
+  static LayerImpl* FindFirstScrollingLayerThatIsHitByPoint(
+      const gfx::PointF& screen_space_point,
+      const LayerImplList& render_surface_layer_list);
+
+  // Performs hit testing for a given render_surface_layer_list.
   static LayerImpl* FindLayerThatIsHitByPoint(
       const gfx::PointF& screen_space_point,
       const LayerImplList& render_surface_layer_list);
@@ -122,16 +131,18 @@ class CC_EXPORT LayerTreeHostCommon {
   template <typename LayerType>
   static LayerType* FindLayerInSubtree(LayerType* root_layer, int layer_id);
 
-  static Layer* get_child_as_raw_ptr(
-      const LayerList& children,
-      size_t index) {
-    return children[index].get();
+  static Layer* get_layer_as_raw_ptr(const LayerList& layers, size_t index) {
+    return layers[index].get();
+  }
+
+  static LayerImpl* get_layer_as_raw_ptr(const OwnedLayerImplList& layers,
+                                         size_t index) {
+    return layers[index];
   }
 
-  static LayerImpl* get_child_as_raw_ptr(
-      const OwnedLayerImplList& children,
-      size_t index) {
-    return children[index];
+  static LayerImpl* get_layer_as_raw_ptr(const LayerImplList& layers,
+                                         size_t index) {
+    return layers[index];
   }
 
   struct ScrollUpdateInfo {
@@ -181,7 +192,7 @@ LayerType* LayerTreeHostCommon::FindLayerInSubtree(LayerType* root_layer,
 
   for (size_t i = 0; i < root_layer->children().size(); ++i) {
     if (LayerType* found = FindLayerInSubtree(
-            get_child_as_raw_ptr(root_layer->children(), i), layer_id))
+            get_layer_as_raw_ptr(root_layer->children(), i), layer_id))
       return found;
   }
   return NULL;
@@ -202,7 +213,7 @@ void LayerTreeHostCommon::CallFunctionForSubtree(
   }
 
   for (size_t i = 0; i < root_layer->children().size(); ++i) {
-    CallFunctionForSubtree(get_child_as_raw_ptr(root_layer->children(), i),
+    CallFunctionForSubtree(get_layer_as_raw_ptr(root_layer->children(), i),
                            function);
   }
 }
@@ -226,7 +237,8 @@ LayerTreeHostCommon::CalcDrawPropsInputsForTesting<LayerType,
           false,
           true,
           false,
-          render_surface_layer_list) {
+          render_surface_layer_list,
+          0) {
   DCHECK(root_layer);
   DCHECK(render_surface_layer_list);
 }
@@ -249,7 +261,8 @@ LayerTreeHostCommon::CalcDrawPropsInputsForTesting<LayerType,
           false,
           true,
           false,
-          render_surface_layer_list) {
+          render_surface_layer_list,
+          0) {
   DCHECK(root_layer);
   DCHECK(render_surface_layer_list);
 }