WIP - compositor worker mega patch.

cc/trees/layer_tree_impl.cc

 // Copyright 2011 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/trees/layer_tree_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 361 matching lines @@
 void LayerTreeImpl::AddToElementMap(LayerImpl* layer) {
   if (!layer->element_id())
     return;
 
   TRACE_EVENT2(TRACE_DISABLED_BY_DEFAULT("compositor-worker"),
                "LayerTreeImpl::AddToElementMap", "element_id",
                layer->element_id(), "layer_id", layer->id());
 
   ElementLayers& layers = element_layers_map_[layer->element_id()];
   if (layer->mutable_properties() & kMainLayerFlags) {
-    if (!layers.main || layer->IsActive())
-      layers.main = layer;
+    layers.main = layer;
   }
   if (layer->mutable_properties() & kScrollLayerFlags) {
-    if (!layers.scroll || layer->IsActive()) {
-      TRACE_EVENT2("compositor-worker", "LayerTreeImpl::AddToElementMap scroll",
-                   "element_id", layer->element_id(), "layer_id", layer->id());
-      layers.scroll = layer;
-    }
+    TRACE_EVENT2("compositor-worker", "LayerTreeImpl::AddToElementMap scroll",
+                 "element_id", layer->element_id(), "layer_id", layer->id());
+    layers.scroll = layer;
   }
 }
 
 void LayerTreeImpl::RemoveFromElementMap(LayerImpl* layer) {
   if (!layer->element_id())
     return;
 
   TRACE_EVENT2(TRACE_DISABLED_BY_DEFAULT("compositor-worker"),
                "LayerTreeImpl::RemoveFromElementMap", "element_id",
                layer->element_id(), "layer_id", layer->id());
@@ skipping 1674 matching lines @@
                                                    const gfx::BoxF& box,
                                                    gfx::BoxF* bounds) const {
   *bounds = gfx::BoxF();
   return layer_tree_host_impl_->animation_host()
              ? layer_tree_host_impl_->animation_host()
                    ->TransformAnimationBoundsForBox(layer->id(), box, bounds)
              : true;
 }
 
 }  // namespace cc