Rendering context information added to SharedQuadState

cc/layers/layer_impl.h

Index: cc/layers/layer_impl.h
diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h
index 2ce6eac06d845e55afb4287c7e6cdfcbe6e02554..44117b82331c96cc67b018dd95c0f8277a80ef50 100644
--- a/cc/layers/layer_impl.h
+++ b/cc/layers/layer_impl.h
@@ -267,8 +267,7 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
   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 rendering_context_id_ != 0; }
 
   void SetUseParentBackfaceVisibility(bool use) {
     use_parent_backface_visibility_ = use;
@@ -542,6 +541,9 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
 
   bool IsDrawnRenderSurfaceLayerListMember() const;
 
+  void SetRenderingContextId(int id);
+  int rendering_context_id() { return rendering_context_id_; }
+
  protected:
   LayerImpl(LayerTreeImpl* layer_impl, int id);
 
@@ -629,7 +631,6 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
 
   // Set for the layer that other layers are fixed to.
   bool is_container_for_fixed_position_layers_ : 1;
-  bool is_3d_sorted_ : 1;
   Region non_fast_scrollable_region_;
   Region touch_event_handler_region_;
   SkColor background_color_;
@@ -664,6 +665,9 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
   // active side.
   int num_dependents_need_push_properties_;
 
+  // The rendering context ID we get from Blink, plumbed through WebLayerImpl
+  int rendering_context_id_;
+
   DrawMode current_draw_mode_;
 
  private: