summaryrefslogtreecommitdiffstats
path: root/cc/tiles
diff options
context:
space:
mode:
authorvollick <vollick@chromium.org>2016-03-01 15:37:04 -0800
committerCommit bot <commit-bot@chromium.org>2016-03-01 23:38:40 +0000
commit1bd5b8399b04cae273eeb670dc07091f72ea28c4 (patch)
treefd09a6a24a6bcce232a6d4eeb52208c25d741293 /cc/tiles
parent964dcffcac8d9e599a5f66fd977c309bf03007d7 (diff)
downloadchromium_src-1bd5b8399b04cae273eeb670dc07091f72ea28c4.zip
chromium_src-1bd5b8399b04cae273eeb670dc07091f72ea28c4.tar.gz
chromium_src-1bd5b8399b04cae273eeb670dc07091f72ea28c4.tar.bz2
Revert of Use LTHI's *_list() accessors whenever possible (patchset #1 id:1 of https://codereview.chromium.org/1748813003/ )
Reason for revert: I'm going to try another, less code-churny, approach to the layer list conversion. Original issue's description: > Use LTHI's *_list() accessors whenever possible > > This is a mechanical patch which replaces instances of > > LTHI->[active|pending|recycle|_tree()->list() > > with > > LTHI->[active|pending|recycle|_list() > > BUG=557194 > CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel > > Committed: https://crrev.com/c2a4176b6099eb93c2198778442e54ad1d1ac78e > Cr-Commit-Position: refs/heads/master@{#378429} TBR=tdresser@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=557194 Review URL: https://codereview.chromium.org/1759443002 Cr-Commit-Position: refs/heads/master@{#378603}
Diffstat (limited to 'cc/tiles')
-rw-r--r--cc/tiles/tile_manager_perftest.cc4
-rw-r--r--cc/tiles/tile_manager_unittest.cc4
2 files changed, 4 insertions, 4 deletions
diff --git a/cc/tiles/tile_manager_perftest.cc b/cc/tiles/tile_manager_perftest.cc
index 19b632c..648ebf1 100644
--- a/cc/tiles/tile_manager_perftest.cc
+++ b/cc/tiles/tile_manager_perftest.cc
@@ -144,7 +144,7 @@ class TileManagerPerfTest : public testing::Test {
CHECK(!host_impl_.pending_tree());
pending_root_layer_ = NULL;
active_root_layer_ = static_cast<FakePictureLayerImpl*>(
- host_impl_.active_list()->LayerById(id_));
+ host_impl_.active_tree()->list()->LayerById(id_));
}
void SetupDefaultTreesWithFixedTileSize(const gfx::Size& layer_bounds,
@@ -176,7 +176,7 @@ class TileManagerPerfTest : public testing::Test {
pending_tree->BuildPropertyTreesForTesting();
pending_root_layer_ = static_cast<FakePictureLayerImpl*>(
- host_impl_.pending_list()->LayerById(id_));
+ host_impl_.pending_tree()->list()->LayerById(id_));
}
void RunRasterQueueConstructTest(const std::string& test_name,
diff --git a/cc/tiles/tile_manager_unittest.cc b/cc/tiles/tile_manager_unittest.cc
index 3122e75..5a3f5eb 100644
--- a/cc/tiles/tile_manager_unittest.cc
+++ b/cc/tiles/tile_manager_unittest.cc
@@ -103,7 +103,7 @@ class TileManagerTilePriorityQueueTest : public testing::Test {
CHECK(!host_impl_.pending_tree());
pending_layer_ = NULL;
active_layer_ = static_cast<FakePictureLayerImpl*>(
- host_impl_.active_list()->LayerById(id_));
+ host_impl_.active_tree()->list()->LayerById(id_));
bool update_lcd_text = false;
host_impl_.active_tree()->UpdateDrawProperties(update_lcd_text);
}
@@ -146,7 +146,7 @@ class TileManagerTilePriorityQueueTest : public testing::Test {
pending_tree->SetRootLayer(std::move(pending_layer));
pending_layer_ = static_cast<FakePictureLayerImpl*>(
- host_impl_.pending_list()->LayerById(id_));
+ host_impl_.pending_tree()->list()->LayerById(id_));
// Add tilings/tiles for the layer.
bool update_lcd_text = false;