Rendering context information added to SharedQuadState

cc/layers/layer.h

Index: cc/layers/layer.h
diff --git a/cc/layers/layer.h b/cc/layers/layer.h
index 9e94b535052c82b8d351be534233f788a4e62e2c..7fba3d7e8a44d2b8bf8a3b52d2448d2f34cab5f3 100644
--- a/cc/layers/layer.h
+++ b/cc/layers/layer.h
@@ -320,8 +320,7 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
   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 (draw_properties_.context_id != 0); }

[danakj, 2014/06/13 19:16:03]

no () needed in the function body

[troyhildebrandt, 2014/06/13 22:56:35]

Done.

 
   void set_use_parent_backface_visibility(bool use) {
     use_parent_backface_visibility_ = use;
@@ -458,6 +457,9 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
 
   virtual void RunMicroBenchmark(MicroBenchmark* benchmark);
 
+  void SetContextId(int id);
+  int context_id() { return draw_properties_.context_id; }
+
  protected:
   friend class LayerImpl;
   friend class TreeSynchronizer;
@@ -588,7 +590,6 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
   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_;