cc: Add id->LayerImpl map to LayerTreeImpl

cc/tree_synchronizer.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/tree_synchronizer.h"
 
 #include "base/debug/trace_event.h"
 #include "cc/layer.h"
 #include "cc/layer_impl.h"
 #include "cc/scrollbar_animation_controller.h"
@@ skipping 19 matching lines @@
 
 void TreeSynchronizer::collectExistingLayerImplRecursive(ScopedPtrLayerImplMap& oldLayers, scoped_ptr<LayerImpl> layerImpl)
 {
     if (!layerImpl)
         return;
 
     ScopedPtrVector<LayerImpl>& children = layerImpl->m_children;
     for (size_t i = 0; i < children.size(); ++i)
         collectExistingLayerImplRecursive(oldLayers, children.take(i));
 
-    collectExistingLayerImplRecursive(oldLayers, layerImpl->m_maskLayer.Pass());
-    collectExistingLayerImplRecursive(oldLayers, layerImpl->m_replicaLayer.Pass());
+    collectExistingLayerImplRecursive(oldLayers, layerImpl->takeMaskLayer());
+    collectExistingLayerImplRecursive(oldLayers, layerImpl->takeReplicaLayer());
 
     int id = layerImpl->id();
     oldLayers.set(id, layerImpl.Pass());
 }
 
 scoped_ptr<LayerImpl> TreeSynchronizer::reuseOrCreateLayerImpl(RawPtrLayerImplMap& newLayers, ScopedPtrLayerImplMap& oldLayers, Layer* layer, LayerTreeImpl* treeImpl)
 {
     scoped_ptr<LayerImpl> layerImpl = oldLayers.take(layer->id());
 
     if (!layerImpl)
@@ skipping 50 matching lines @@
     DCHECK(scrollbarLayerImpl);
     DCHECK(scrollLayerImpl);
 
     if (scrollbarLayerImpl->orientation() == WebKit::WebScrollbar::Horizontal)
         scrollLayerImpl->setHorizontalScrollbarLayer(scrollbarLayerImpl);
     else
         scrollLayerImpl->setVerticalScrollbarLayer(scrollbarLayerImpl);
 }
 
 }  // namespace cc