cc: Consolidate LayerList types.
We currently have Layer::LayerList, LayerImpl::LayerList,
LayerTreeHost::LayerList and LayerTreeHostImpl::LayerList,
as well as LayerTreeImpl::LayerList, LayerSorter::LayerList,
and I think some more.
This patch consolidates the list typedefs into three types:
LayerList, LayerImplList, and OwnedLayerImplList.
LayerList and LayerImplList are the output of
CalculateDrawProperties. While OwnedLayerImplList is a list
that owns the layer pointers in it, ie ScopedPtrVector.
R=jamesr
Review URL: https://codereview.chromium.org/13285002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191442 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index 3d975ee..281671e 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -24,7 +24,9 @@
#include "cc/input/top_controls_manager.h"
#include "cc/layers/append_quads_data.h"
#include "cc/layers/heads_up_display_layer_impl.h"
+#include "cc/layers/layer_impl.h"
#include "cc/layers/layer_iterator.h"
+#include "cc/layers/render_surface_impl.h"
#include "cc/layers/scrollbar_layer_impl.h"
#include "cc/output/compositor_frame_metadata.h"
#include "cc/output/delegating_renderer.h"
@@ -364,7 +366,7 @@
void LayerTreeHostImpl::TrackDamageForAllSurfaces(
LayerImpl* root_draw_layer,
- const LayerList& render_surface_layer_list) {
+ const LayerImplList& render_surface_layer_list) {
// For now, we use damage tracking to compute a global scissor. To do this, we
// must compute all damage tracking before drawing anything, so that we know
// the root damage rect. The root damage rect is then used to scissor each
@@ -539,7 +541,7 @@
// Add quads to the Render passes in FrontToBack order to allow for testing
// occlusion and performing culling during the tree walk.
typedef LayerIterator<LayerImpl,
- std::vector<LayerImpl*>,
+ LayerImplList,
RenderSurfaceImpl,
LayerIteratorActions::FrontToBack> LayerIteratorType;
@@ -2040,7 +2042,7 @@
if (layer->DrawsContent())
return layer;
- for (LayerImpl::LayerList::const_iterator it = layer->children().begin();
+ for (LayerImplList::const_iterator it = layer->children().begin();
it != layer->children().end(); ++it) {
LayerImpl* nccr = GetNonCompositedContentLayerRecursive(*it);
if (nccr)
