Rendering context information added to SharedQuadState

cc/layers/layer.h

 // Copyright 2010 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_LAYER_H_
 #define CC_LAYERS_LAYER_H_
 
 #include <set>
 #include <string>
 
@@ skipping 302 matching lines @@
     // Floating point to match the LayerImpl version.
     return scroll_offset() + ScrollDelta();
   }
 
   void SetDoubleSided(bool double_sided);
   bool double_sided() const { return double_sided_; }
 
   void SetShouldFlattenTransform(bool flatten);
   bool should_flatten_transform() const { return should_flatten_transform_; }
 
-  void SetIs3dSorted(bool sorted);
-  bool is_3d_sorted() const { return is_3d_sorted_; }
+  bool Is3dSorted() const { return sorting_context_id_ != 0; }
 
   void set_use_parent_backface_visibility(bool use) {
     use_parent_backface_visibility_ = use;
   }
   bool use_parent_backface_visibility() const {
     return use_parent_backface_visibility_;
   }
 
   virtual void SetLayerTreeHost(LayerTreeHost* host);
 
@@ skipping 116 matching lines @@
   bool needs_push_properties() const { return needs_push_properties_; }
   bool descendant_needs_push_properties() const {
     return num_dependents_need_push_properties_ > 0;
   }
   void reset_needs_push_properties_for_testing() {
     needs_push_properties_ = false;
   }
 
   virtual void RunMicroBenchmark(MicroBenchmark* benchmark);
 
+  void Set3dSortingContextId(int id);
+  int sorting_context_id() const { return sorting_context_id_; }
+
  protected:
   friend class LayerImpl;
   friend class TreeSynchronizer;
   virtual ~Layer();
 
   Layer();
 
   // These SetNeeds functions are in order of severity of update:
   //
   // Called when this layer has been modified in some way, but isn't sure
@@ skipping 52 matching lines @@
   gfx::RectF update_rect_;
 
   scoped_refptr<Layer> mask_layer_;
 
   int layer_id_;
 
   // When true, the layer is about to perform an update. Any commit requests
   // will be handled implicitly after the update completes.
   bool ignore_set_needs_commit_;
 
+  // The rendering context ID, necessary for properly sorting 3D layers.

[enne (OOO), 2014/06/17 00:46:04]

This comment is also not that helpful.  Maybe something like what I suggested
for LayerImpl would be helpful here.

[troyhildebrandt, 2014/06/17 16:33:20]

Done.

+  int sorting_context_id_;
+
  private:
   friend class base::RefCounted<Layer>;
 
   void SetParent(Layer* layer);
   bool DescendantIsFixedToContainerLayer() const;
 
   // Returns the index of the child or -1 if not found.
   int IndexOfChild(const Layer* reference);
 
   // This should only be called from RemoveFromParent().
@@ skipping 38 matching lines @@
   bool is_container_for_fixed_position_layers_ : 1;
   bool is_drawable_ : 1;
   bool hide_layer_and_subtree_ : 1;
   bool masks_to_bounds_ : 1;
   bool contents_opaque_ : 1;
   bool double_sided_ : 1;
   bool should_flatten_transform_ : 1;
   bool use_parent_backface_visibility_ : 1;
   bool draw_checkerboard_for_missing_tiles_ : 1;
   bool force_render_surface_ : 1;
-  bool is_3d_sorted_ : 1;
   bool transform_is_invertible_ : 1;
   Region non_fast_scrollable_region_;
   Region touch_event_handler_region_;
   gfx::PointF position_;
   SkColor background_color_;
   float opacity_;
   SkXfermode::Mode blend_mode_;
   FilterOperations filters_;
   FilterOperations background_filters_;
   LayerPositionConstraint position_constraint_;
@@ skipping 21 matching lines @@
   DrawProperties<Layer> draw_properties_;
 
   PaintProperties paint_properties_;
 
   DISALLOW_COPY_AND_ASSIGN(Layer);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYERS_LAYER_H_