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

Unified Diff: cc/test/fake_layer_tree_host_client.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/test/fake_delegated_renderer_layer_impl.cc ('k') | cc/test/fake_output_surface.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/fake_layer_tree_host_client.cc
diff --git a/cc/test/fake_layer_tree_host_client.cc b/cc/test/fake_layer_tree_host_client.cc
index 17ed10c0af5b9f81d906760fc5313b253cfac987..087cbb150e239f5f4b00a66e692eb33295edc843 100644
--- a/cc/test/fake_layer_tree_host_client.cc
+++ b/cc/test/fake_layer_tree_host_client.cc
@@ -27,15 +27,17 @@
if (use_software_rendering_) {
if (use_delegating_renderer_) {
surface = FakeOutputSurface::CreateDelegatingSoftware(
- make_scoped_ptr(new SoftwareOutputDevice));
+ make_scoped_ptr(new SoftwareOutputDevice))
+ .PassAs<OutputSurface>();
} else {
surface = FakeOutputSurface::CreateSoftware(
- make_scoped_ptr(new SoftwareOutputDevice));
+ make_scoped_ptr(new SoftwareOutputDevice))
+ .PassAs<OutputSurface>();
}
} else if (use_delegating_renderer_) {
- surface = FakeOutputSurface::CreateDelegating3d();
+ surface = FakeOutputSurface::CreateDelegating3d().PassAs<OutputSurface>();
} else {
- surface = FakeOutputSurface::Create3d();
+ surface = FakeOutputSurface::Create3d().PassAs<OutputSurface>();
}
host_->SetOutputSurface(surface.Pass());
}
« no previous file with comments | « cc/test/fake_delegated_renderer_layer_impl.cc ('k') | cc/test/fake_output_surface.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698