Revert of Generalize scroll parent work in CalculateDrawProperties

cc/layers/draw_properties.h

 // Copyright 2012 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.
 
 #ifndef CC_LAYERS_DRAW_PROPERTIES_H_
 #define CC_LAYERS_DRAW_PROPERTIES_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/transform.h"
@@ skipping 11 matching lines @@
         target_space_transform_is_animating(false),
         screen_space_transform_is_animating(false),
         can_use_lcd_text(false),
         is_clipped(false),
         render_target(NULL),
         contents_scale_x(1.f),
         contents_scale_y(1.f),
         num_unclipped_descendants(0),
         layer_or_descendant_has_copy_request(false),
         layer_or_descendant_has_input_handler(false),
+        has_child_with_a_scroll_parent(false),
+        sorted_for_recursion(false),
         index_of_first_descendants_addition(0),
         num_descendants_added(0),
         index_of_first_render_surface_layer_list_addition(0),
         num_render_surfaces_added(0),
         last_drawn_render_surface_layer_list_id(0),
         ideal_contents_scale(0.f),
         maximum_animation_contents_scale(0.f),
         page_scale_factor(0.f),
-        device_scale_factor(0.f),
-        children_need_sorting(false),
-        sequence_number(0),
-        sort_weight(0),
-        sort_weight_sequence_number(0),
-        depth(0) {}
+        device_scale_factor(0.f) {}
 
   // Transforms objects from content space to target surface space, where
   // this layer would be drawn.
   gfx::Transform target_space_transform;
 
   // Transforms objects from content space to screen space (viewport space).
   gfx::Transform screen_space_transform;
 
   // DrawProperties::opacity may be different than LayerType::opacity,
   // particularly in the case when a RenderSurface re-parents the layer's
@@ skipping 46 matching lines @@
   // does not include our clip children because they are clipped by us.
   int num_unclipped_descendants;
 
   // If true, the layer or some layer in its sub-tree has a CopyOutputRequest
   // present on it.
   bool layer_or_descendant_has_copy_request;
 
   // If true, the layer or one of its descendants has a wheel or touch handler.
   bool layer_or_descendant_has_input_handler;
 
+  // This is true if the layer has any direct child that has a scroll parent.
+  // This layer will not be the scroll parent in this case. This information
+  // lets us avoid work in CalculateDrawPropertiesInternal -- if none of our
+  // children have scroll parents, we will not need to recur out of order.
+  bool has_child_with_a_scroll_parent;
+
+  // This is true if the order (wrt to its siblings in the tree) in which the
+  // layer will be visited while computing draw properties has been determined.
+  bool sorted_for_recursion;
+
   // If this layer is visited out of order, its contribution to the descendant
   // and render surface layer lists will be put aside in a temporary list.
   // These values will allow for an efficient reordering of these additions.
   size_t index_of_first_descendants_addition;
   size_t num_descendants_added;
   size_t index_of_first_render_surface_layer_list_addition;
   size_t num_render_surfaces_added;
 
   // Each time we generate a new render surface layer list, an ID is used to
   // identify it. |last_drawn_render_surface_layer_list_id| is set to the ID
@@ skipping 11 matching lines @@
   // The maximum scale during the layers current animation at which content
   // should be rastered at to be crisp.
   float maximum_animation_contents_scale;
 
   // The page scale factor that is applied to the layer. Since some layers may
   // have page scale applied and others not, this may differ between layers.
   float page_scale_factor;
 
   // The device scale factor that is applied to the layer.
   float device_scale_factor;
-
-  // This is used to detect cases when a layer needs to sort its children to
-  // ensure that scroll parents are visited before scroll children.
-  bool children_need_sorting;
-
-  // This sequence number is used to determine if we've visited this layer in
-  // PreCalculateMetaInformation.
-  int sequence_number;
-
-  // Determines the order the layer should be processed in
-  // CalculateDrawProperties wrt to its siblings. If you have lower
-  // |sort_weight| you get visited first.
-  int sort_weight;
-
-  // This sequence number is used to determine if a sort weight has already been
-  // assigned for a layer. We may assign a sort weight before we visit a layer,
-  // and it's important that we don't clobber it when we do eventually visit the
-  // layer.
-  int sort_weight_sequence_number;
-
-  // This is the topological depth in the tree. (E.g., root has depth zero).
-  // This is used to make it faster to find the lowest common ancestor of two
-  // layers.
-  int depth;
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYERS_DRAW_PROPERTIES_H_