Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2682)

Unified Diff: cc/trees/layer_tree_impl.cc

Issue 13285002: cc: Consolidate LayerList types. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/trees/layer_tree_impl.h ('k') | cc/trees/occlusion_tracker.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_impl.cc
diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
index 004af24100bb5724b37906d4372b75eb4e26df97..bc9acf5a9e2df5015736e5859b98110e4c496ce4 100644
--- a/cc/trees/layer_tree_impl.cc
+++ b/cc/trees/layer_tree_impl.cc
@@ -12,6 +12,7 @@
#include "cc/input/pinch_zoom_scrollbar.h"
#include "cc/layers/heads_up_display_layer_impl.h"
#include "cc/layers/layer.h"
+#include "cc/layers/render_surface_impl.h"
#include "cc/layers/scrollbar_layer_impl.h"
#include "cc/trees/layer_tree_host_common.h"
#include "cc/trees/layer_tree_host_impl.h"
@@ -334,7 +335,7 @@ bool LayerTreeImpl::AreVisibleResourcesReady() const {
TRACE_EVENT0("cc", "LayerTreeImpl::AreVisibleResourcesReady");
typedef LayerIterator<LayerImpl,
- std::vector<LayerImpl*>,
+ LayerImplList,
RenderSurfaceImpl,
LayerIteratorActions::BackToFront> LayerIteratorType;
LayerIteratorType end = LayerIteratorType::End(&render_surface_layer_list_);
@@ -347,7 +348,7 @@ bool LayerTreeImpl::AreVisibleResourcesReady() const {
return true;
}
-const LayerTreeImpl::LayerList& LayerTreeImpl::RenderSurfaceLayerList() const {
+const LayerImplList& LayerTreeImpl::RenderSurfaceLayerList() const {
// If this assert triggers, then the list is dirty.
DCHECK(!needs_update_draw_properties_);
return render_surface_layer_list_;
@@ -538,7 +539,7 @@ AnimationRegistrar* LayerTreeImpl::animationRegistrar() const {
scoped_ptr<base::Value> LayerTreeImpl::AsValue() const {
scoped_ptr<base::ListValue> state(new base::ListValue());
typedef LayerIterator<LayerImpl,
- std::vector<LayerImpl*>,
+ LayerImplList,
RenderSurfaceImpl,
LayerIteratorActions::BackToFront> LayerIteratorType;
LayerIteratorType end = LayerIteratorType::End(&render_surface_layer_list_);
« no previous file with comments | « cc/trees/layer_tree_impl.h ('k') | cc/trees/occlusion_tracker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698