compositor-worker: Introduce WebCompositorMutableState

cc/layers/layer_impl.cc

 // 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.
 
 #include "cc/layers/layer_impl.h"
 
 #include "base/json/json_reader.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event.h"
@@ skipping 88 matching lines @@
   if (!layer_tree_impl_->settings().use_compositor_animation_timelines) {
     AnimationRegistrar* registrar = layer_tree_impl_->GetAnimationRegistrar();
     layer_animation_controller_ =
         registrar->GetAnimationControllerForId(layer_id_);
     layer_animation_controller_->AddValueObserver(this);
     if (IsActive()) {
       layer_animation_controller_->set_value_provider(this);
       layer_animation_controller_->set_layer_animation_delegate(this);
     }
   }
+
+  if (element_id_)
+    layer_tree_impl_->AddToElementMap(this);
+
   SetNeedsPushProperties();
 }
 
 LayerImpl::~LayerImpl() {
   DCHECK_EQ(DRAW_MODE_NONE, current_draw_mode_);
 
   if (layer_animation_controller_) {
     layer_animation_controller_->RemoveValueObserver(this);
     layer_animation_controller_->remove_value_provider(this);
     layer_animation_controller_->remove_layer_animation_delegate(this);
   }
 
   if (!copy_requests_.empty() && layer_tree_impl_->IsActiveTree())
     layer_tree_impl()->RemoveLayerWithCopyOutputRequest(this);
   layer_tree_impl_->UnregisterScrollLayer(this);
   layer_tree_impl_->UnregisterLayer(this);
 
+  if (element_id_)
+    layer_tree_impl_->RemoveFromElementMap(this);
+
   TRACE_EVENT_OBJECT_DELETED_WITH_ID(
       TRACE_DISABLED_BY_DEFAULT("cc.debug"), "cc::LayerImpl", this);
 }
 
 void LayerImpl::AddChild(scoped_ptr<LayerImpl> child) {
   child->SetParent(this);
   DCHECK_EQ(layer_tree_impl(), child->layer_tree_impl());
   children_.push_back(child.Pass());
   layer_tree_impl()->set_needs_update_draw_properties();
 }
@@ skipping 1076 matching lines @@
   return opacity_animation && opacity_animation->is_impl_only();
 }
 
 void LayerImpl::SetElementId(uint64_t element_id) {
   if (element_id == element_id_)
     return;
 
   TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("compositor-worker"),
                "LayerImpl::SetElementId", "id", element_id);
 
+  if (element_id_)
+    layer_tree_impl_->RemoveFromElementMap(this);
   element_id_ = element_id;
+  if (element_id_)
+    layer_tree_impl_->AddToElementMap(this);
   SetNeedsPushProperties();
 }
 
 void LayerImpl::SetMutableProperties(uint32_t properties) {
   if (mutable_properties_ == properties)
     return;
 
   TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("compositor-worker"),
                "LayerImpl::SetMutableProperties", "properties", properties);
 
   mutable_properties_ = properties;
+  // If this layer is already in the element map, we will add it again in order
+  // to update the layer assignments per these new properties.
+  if (element_id_)
+    layer_tree_impl_->AddToElementMap(this);
   SetNeedsPushProperties();
 }
 
 void LayerImpl::SetBlendMode(SkXfermode::Mode blend_mode) {
   if (blend_mode_ == blend_mode)
     return;
 
   blend_mode_ = blend_mode;
   NoteLayerPropertyChangedForSubtree();
 }
@@ skipping 586 matching lines @@
   }
 
   // TODO(enne): the transform needs to come from property trees instead of
   // draw properties.
   gfx::Vector2dF transform_scales = MathUtil::ComputeTransform2dScaleComponents(
       draw_properties().target_space_transform, default_scale);
   return std::max(transform_scales.x(), transform_scales.y());
 }
 
 }  // namespace cc