diff options
| author | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-01 00:49:15 +0000 |
|---|---|---|
| committer | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-01 00:49:15 +0000 |
| commit | fc20d140327d42ddccf94cc5cb698b4705f7294d (patch) | |
| tree | 39eed208f91a29e0de0289d3591fae7adb94a078 /cc/resources | |
| parent | 425f6470a5339763301edc0b5af3601dd91ed313 (diff) | |
| download | chromium_src-fc20d140327d42ddccf94cc5cb698b4705f7294d.zip chromium_src-fc20d140327d42ddccf94cc5cb698b4705f7294d.tar.gz chromium_src-fc20d140327d42ddccf94cc5cb698b4705f7294d.tar.bz2 | |
cc: Activate sync tree instead of pending tree.
This patch does not change anything functionally. It prepares
us to skip pending tree for commit. It essentially unifies
the activation for both impl-side and non-impl-side painting
paths.
BUG=383157
Review URL: https://codereview.chromium.org/345563011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280717 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/resources')
| -rw-r--r-- | cc/resources/tile_manager_perftest.cc | 2 | ||||
| -rw-r--r-- | cc/resources/tile_manager_unittest.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cc/resources/tile_manager_perftest.cc b/cc/resources/tile_manager_perftest.cc index e17c661..3b2df2a 100644 --- a/cc/resources/tile_manager_perftest.cc +++ b/cc/resources/tile_manager_perftest.cc @@ -130,7 +130,7 @@ class TileManagerPerfTest : public testing::Test { } void ActivateTree() { - host_impl_.ActivatePendingTree(); + host_impl_.ActivateSyncTree(); CHECK(!host_impl_.pending_tree()); pending_root_layer_ = NULL; active_root_layer_ = static_cast<FakePictureLayerImpl*>( diff --git a/cc/resources/tile_manager_unittest.cc b/cc/resources/tile_manager_unittest.cc index 024ca20..d62c360 100644 --- a/cc/resources/tile_manager_unittest.cc +++ b/cc/resources/tile_manager_unittest.cc @@ -476,7 +476,7 @@ class TileManagerTileIteratorTest : public testing::Test { } void ActivateTree() { - host_impl_.ActivatePendingTree(); + host_impl_.ActivateSyncTree(); CHECK(!host_impl_.pending_tree()); pending_layer_ = NULL; active_layer_ = static_cast<FakePictureLayerImpl*>( @@ -539,7 +539,7 @@ class TileManagerTileIteratorTest : public testing::Test { TEST_F(TileManagerTileIteratorTest, PairedPictureLayers) { host_impl_.CreatePendingTree(); - host_impl_.ActivatePendingTree(); + host_impl_.ActivateSyncTree(); host_impl_.CreatePendingTree(); LayerTreeImpl* active_tree = host_impl_.active_tree(); |