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

Unified Diff: cc/trees/layer_sorter.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_sorter.h ('k') | cc/trees/layer_sorter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_sorter.cc
diff --git a/cc/trees/layer_sorter.cc b/cc/trees/layer_sorter.cc
index 232f29ff2bab39c0b8bb85acfad6e01134039753..695c8a44cae05cf5b40b0a297ca5efd85c2bfce7 100644
--- a/cc/trees/layer_sorter.cc
+++ b/cc/trees/layer_sorter.cc
@@ -259,12 +259,12 @@ float LayerShape::LayerZFromProjectedPoint(gfx::PointF p) const {
return n / d;
}
-void LayerSorter::CreateGraphNodes(LayerList::iterator first,
- LayerList::iterator last) {
+void LayerSorter::CreateGraphNodes(LayerImplList::iterator first,
+ LayerImplList::iterator last) {
DVLOG(2) << "Creating graph nodes:";
float min_z = FLT_MAX;
float max_z = -FLT_MAX;
- for (LayerList::const_iterator it = first; it < last; it++) {
+ for (LayerImplList::const_iterator it = first; it < last; it++) {
nodes_.push_back(GraphNode(*it));
GraphNode& node = nodes_.at(nodes_.size() - 1);
RenderSurfaceImpl* render_surface = node.layer->render_surface();
@@ -373,7 +373,8 @@ void LayerSorter::RemoveEdgeFromList(GraphEdge* edge,
// preserve the ordering of the original list of layers, since that list should
// already have proper z-index ordering of layers.
//
-void LayerSorter::Sort(LayerList::iterator first, LayerList::iterator last) {
+void LayerSorter::Sort(LayerImplList::iterator first,
+ LayerImplList::iterator last) {
DVLOG(2) << "Sorting start ----";
CreateGraphNodes(first, last);
@@ -454,7 +455,7 @@ void LayerSorter::Sort(LayerList::iterator first, LayerList::iterator last) {
// ref count go to zero here as they are all nodes of the layer hierarchy and
// are kept alive by their parent nodes.
int count = 0;
- for (LayerList::iterator it = first; it < last; it++)
+ for (LayerImplList::iterator it = first; it < last; it++)
*it = sorted_list[count++]->layer;
DVLOG(2) << "Sorting end ----";
« no previous file with comments | « cc/trees/layer_sorter.h ('k') | cc/trees/layer_sorter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698