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

Unified Diff: cc/trees/occlusion_tracker_perftest.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/trees/layer_tree_impl_unittest.cc ('k') | cc/trees/occlusion_tracker_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/occlusion_tracker_perftest.cc
diff --git a/cc/trees/occlusion_tracker_perftest.cc b/cc/trees/occlusion_tracker_perftest.cc
index 37cd8a690a4d729a72adb2642f09b4c47a8a4fdf..14a9ffd272d18baa7e2179330f52c765055118f0 100644
--- a/cc/trees/occlusion_tracker_perftest.cc
+++ b/cc/trees/occlusion_tracker_perftest.cc
@@ -38,7 +38,8 @@
shared_bitmap_manager_.reset(new TestSharedBitmapManager());
host_impl_ = LayerTreeHostImpl::Create(
settings, &client_, &proxy_, &stats_, shared_bitmap_manager_.get(), 1);
- host_impl_->InitializeRenderer(FakeOutputSurface::Create3d());
+ host_impl_->InitializeRenderer(
+ FakeOutputSurface::Create3d().PassAs<OutputSurface>());
scoped_ptr<LayerImpl> root_layer = LayerImpl::Create(active_tree(), 1);
active_tree()->SetRootLayer(root_layer.Pass());
@@ -85,7 +86,7 @@
opaque_layer->SetDrawsContent(true);
opaque_layer->SetBounds(viewport_rect.size());
opaque_layer->SetContentBounds(viewport_rect.size());
- active_tree()->root_layer()->AddChild(opaque_layer.Pass());
+ active_tree()->root_layer()->AddChild(opaque_layer.PassAs<LayerImpl>());
active_tree()->UpdateDrawProperties();
const LayerImplList& rsll = active_tree()->RenderSurfaceLayerList();
@@ -155,7 +156,7 @@
opaque_layer->SetContentBounds(
gfx::Size(viewport_rect.width() / 2, viewport_rect.height() / 2));
opaque_layer->SetPosition(gfx::Point(i, i));
- active_tree()->root_layer()->AddChild(opaque_layer.Pass());
+ active_tree()->root_layer()->AddChild(opaque_layer.PassAs<LayerImpl>());
}
active_tree()->UpdateDrawProperties();
« no previous file with comments | « cc/trees/layer_tree_impl_unittest.cc ('k') | cc/trees/occlusion_tracker_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698