WIP - compositor worker mega patch.

cc/trees/layer_tree_impl.cc

Index: cc/trees/layer_tree_impl.cc
diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
index 513ce5e5bd5b267efe90f41ba05f87519af69e0d..78c75c6ccbe3f276fbc65b262450c86263141e24 100644
--- a/cc/trees/layer_tree_impl.cc
+++ b/cc/trees/layer_tree_impl.cc
@@ -379,15 +379,12 @@ void LayerTreeImpl::AddToElementMap(LayerImpl* layer) {
 
   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;
   }
 }