cc: Add id->LayerImpl map to LayerTreeImpl

cc/quad_culler_unittest.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/quad_culler.h"
 
 #include "cc/append_quads_data.h"
 #include "cc/layer_tiling_data.h"
 #include "cc/math_util.h"
 #include "cc/occlusion_tracker.h"
@@ skipping 25 matching lines @@
     gfx::Rect m_scissorRectInScreen;
 };
 
 typedef LayerIterator<LayerImpl, std::vector<LayerImpl*>, RenderSurfaceImpl, LayerIteratorActions::FrontToBack> LayerIteratorType;
 
 class QuadCullerTest : public testing::Test
 {
 public:
     QuadCullerTest()
         : m_hostImpl(&m_proxy)
+        , m_layerId(1)
     {
     }
 
     scoped_ptr<TiledLayerImpl> makeLayer(TiledLayerImpl* parent, const gfx::Transform& drawTransform, const gfx::Rect& layerRect, float opacity, bool opaque, const gfx::Rect& layerOpaqueRect, std::vector<LayerImpl*>& surfaceLayerList)
     {
-        scoped_ptr<TiledLayerImpl> layer = TiledLayerImpl::create(m_hostImpl.activeTree(), 1);
+        scoped_ptr<TiledLayerImpl> layer = TiledLayerImpl::create(m_hostImpl.activeTree(), m_layerId++);
         scoped_ptr<LayerTilingData> tiler = LayerTilingData::create(gfx::Size(100, 100), LayerTilingData::NoBorderTexels);
         tiler->setBounds(layerRect.size());
         layer->setTilingData(*tiler);
         layer->setSkipsDraw(false);
         layer->drawProperties().target_space_transform = drawTransform;
         layer->drawProperties().screen_space_transform = drawTransform;
         layer->drawProperties().visible_content_rect = layerRect;
         layer->drawProperties().opacity = opacity;
         layer->setContentsOpaque(opaque);
         layer->setBounds(layerRect.size());
@@ skipping 27 matching lines @@
         QuadCuller quadCuller(quadList, sharedStateList, layer, occlusionTracker, false, false);
         AppendQuadsData data;
         layer->appendQuads(quadCuller, data);
         occlusionTracker.leaveLayer(it);
         ++it;
     }
 
 protected:
     FakeImplProxy m_proxy;
     FakeLayerTreeHostImpl m_hostImpl;
+    int m_layerId;
 };
 
 #define DECLARE_AND_INITIALIZE_TEST_QUADS               \
     QuadList quadList;                                  \
     SharedQuadStateList sharedStateList;                \
     std::vector<LayerImpl*> renderSurfaceLayerList;     \
     gfx::Transform childTransform;                      \
     gfx::Size rootSize = gfx::Size(300, 300);           \
     gfx::Rect rootRect = gfx::Rect(rootSize);           \
     gfx::Size childSize = gfx::Size(200, 200);          \
@@ skipping 363 matching lines @@
     appendQuads(quadList, sharedStateList, childLayer.get(), it, occlusionTracker);
     appendQuads(quadList, sharedStateList, rootLayer.get(), it, occlusionTracker);
     EXPECT_EQ(quadList.size(), 9u);
     EXPECT_NEAR(occlusionTracker.overdrawMetrics().pixelsDrawnOpaque(), 0, 1);
     EXPECT_NEAR(occlusionTracker.overdrawMetrics().pixelsDrawnTranslucent(), 0, 1);
     EXPECT_NEAR(occlusionTracker.overdrawMetrics().pixelsCulledForDrawing(), 0, 1);
 }
 
 }  // namespace
 }  // namespace cc