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

Unified Diff: cc/resources/tile_manager_unittest.cc

Issue 608503005: Revert of cc: Remove use of PassAs() and constructor-casting with scoped_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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/resources/tile_manager_perftest.cc ('k') | cc/resources/ui_resource_request.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/tile_manager_unittest.cc
diff --git a/cc/resources/tile_manager_unittest.cc b/cc/resources/tile_manager_unittest.cc
index 3fb5b134c4bbd9c4be8612e3424e8aae0d4586c3..41c15cda5518f3033fdb649f4558fe901c2c0ec3 100644
--- a/cc/resources/tile_manager_unittest.cc
+++ b/cc/resources/tile_manager_unittest.cc
@@ -520,7 +520,8 @@
}
virtual void InitializeRenderer() {
- host_impl_.InitializeRenderer(FakeOutputSurface::Create3d());
+ host_impl_.InitializeRenderer(
+ FakeOutputSurface::Create3d().PassAs<OutputSurface>());
}
void SetupDefaultTrees(const gfx::Size& layer_bounds) {
@@ -565,7 +566,7 @@
scoped_ptr<FakePictureLayerImpl> pending_layer =
FakePictureLayerImpl::CreateWithPile(pending_tree, id_, pile);
pending_layer->SetDrawsContent(true);
- pending_tree->SetRootLayer(pending_layer.Pass());
+ pending_tree->SetRootLayer(pending_layer.PassAs<LayerImpl>());
pending_layer_ = static_cast<FakePictureLayerImpl*>(
host_impl_.pending_tree()->LayerById(id_));
@@ -940,7 +941,7 @@
scoped_ptr<FakePictureLayerImpl> pending_child =
FakePictureLayerImpl::CreateWithPile(
host_impl_.pending_tree(), 2, pending_pile);
- pending_layer_->AddChild(pending_child.Pass());
+ pending_layer_->AddChild(pending_child.PassAs<LayerImpl>());
FakePictureLayerImpl* pending_child_layer =
static_cast<FakePictureLayerImpl*>(pending_layer_->children()[0]);
@@ -1073,7 +1074,7 @@
pending_layer->SetDrawsContent(true);
pending_layer->DoPostCommitInitializationIfNeeded();
pending_layer->set_has_valid_tile_priorities(true);
- pending_layer_->AddChild(pending_layer.Pass());
+ pending_layer_->AddChild(pending_layer.PassAs<LayerImpl>());
}
host_impl_.BuildRasterQueue(&queue, SAME_PRIORITY_FOR_BOTH_TREES);
@@ -1122,7 +1123,7 @@
pending_layer->SetDrawsContent(true);
pending_layer->DoPostCommitInitializationIfNeeded();
pending_layer->set_has_valid_tile_priorities(true);
- pending_layer_->AddChild(pending_layer.Pass());
+ pending_layer_->AddChild(pending_layer.PassAs<LayerImpl>());
}
host_impl_.BuildEvictionQueue(&queue, SAME_PRIORITY_FOR_BOTH_TREES);
« no previous file with comments | « cc/resources/tile_manager_perftest.cc ('k') | cc/resources/ui_resource_request.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698