Rendering context information added to SharedQuadState

cc/layers/layer.cc

Index: cc/layers/layer.cc
diff --git a/cc/layers/layer.cc b/cc/layers/layer.cc
index 67664e088be7be396dc3318099fdc3ec3f71ee89..4765e8bd691772212daf674619fc690583baa4ae 100644
--- a/cc/layers/layer.cc
+++ b/cc/layers/layer.cc
@@ -61,7 +61,6 @@ Layer::Layer()
       use_parent_backface_visibility_(false),
       draw_checkerboard_for_missing_tiles_(false),
       force_render_surface_(false),
-      is_3d_sorted_(false),
       transform_is_invertible_(true),
       background_color_(0),
       opacity_(1.f),
@@ -756,11 +755,11 @@ void Layer::SetDoubleSided(bool double_sided) {
   SetNeedsCommit();
 }
 
-void Layer::SetIs3dSorted(bool sorted) {
+void Layer::SetContextId(int id) {

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

can you give this name a bit more "context" (ha ha) in it's name, just the word
context doesn't give a reader an idea of what this id is. then please propagate
that more descriptive name throughout the rest of the CL.

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

Done.

   DCHECK(IsPropertyChangeAllowed());
-  if (is_3d_sorted_ == sorted)
+  if ((id == 0 && context_id() == 0) || (id > 0 && context_id() > 0))
     return;
-  is_3d_sorted_ = sorted;
+  draw_properties_.context_id = id;

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

If we're setting this property with a Set method on Layer then it isn't a draw
property, either this Set method needs to go (and we set this inside
CalculateDrawProperties directly on the draw_props, or we make this a member of
the Layer class instead of draw_properties.

It looks to me like you want to remove this from draw_props and put it as a
member on Layer and LayerImpl instead (like is_3d_sorted_ was before)

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

Done.

   SetNeedsCommit();
 }
 
@@ -894,7 +893,7 @@ void Layer::PushPropertiesTo(LayerImpl* layer) {
       IsContainerForFixedPositionLayers());
   layer->SetPositionConstraint(position_constraint_);
   layer->SetShouldFlattenTransform(should_flatten_transform_);
-  layer->SetIs3dSorted(is_3d_sorted_);
+  layer->SetContextId(context_id());
   layer->SetUseParentBackfaceVisibility(use_parent_backface_visibility_);
   if (!layer->TransformIsAnimatingOnImplOnly() && !TransformIsAnimating())
     layer->SetTransformAndInvertibility(transform_, transform_is_invertible_);