WIP - compositor worker mega patch.

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 <stddef.h>
 #include <stdint.h>
 
 #include <utility>
@@ skipping 114 matching lines @@
     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(std::move(child));
   layer_tree_impl()->set_needs_update_draw_properties();
 }
@@ skipping 1090 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 (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 271 matching lines @@
     gfx::ScrollOffset current_offset = scroll_offset_->Current(IsActive());
     if (node->data.scroll_offset != current_offset) {
       node->data.scroll_offset = current_offset;
       node->data.needs_local_transform_update = true;
       transform_tree.set_needs_update(true);
     }
   }
 }
 
 void LayerImpl::DidUpdateScrollOffset() {
+  TRACE_EVENT2("compositor-worker,scroll-compensation",
+               "LayerImpl::DidUpdateScrollOffset", "x",
+               scroll_offset_->Current(IsActive()).x(), "y",
+               scroll_offset_->Current(IsActive()).y());
+
   DCHECK(scroll_offset_);
 
   layer_tree_impl()->DidUpdateScrollState(id());
   NoteLayerPropertyChangedForSubtree();
 
   UpdatePropertyTreeScrollOffset();
 
   // Inform the pending twin that a property changed.
   if (layer_tree_impl()->IsActiveTree()) {
     LayerImpl* pending_twin = layer_tree_impl()->FindPendingTreeLayerById(id());
@@ skipping 342 matching lines @@
            .layer_transforms_should_scale_layer_contents) {
     return default_scale;
   }
 
   gfx::Vector2dF transform_scales = MathUtil::ComputeTransform2dScaleComponents(
       DrawTransform(), default_scale);
   return std::max(transform_scales.x(), transform_scales.y());
 }
 
 }  // namespace cc