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

Unified Diff: cc/layers/texture_layer_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/layers/texture_layer_impl.cc ('k') | cc/layers/tiled_layer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/texture_layer_unittest.cc
diff --git a/cc/layers/texture_layer_unittest.cc b/cc/layers/texture_layer_unittest.cc
index b3c48fbba2d4cc0e89567a8209f8548a347f94b5..feb712654af9a998fa0954ce10e0922e619a2a2b 100644
--- a/cc/layers/texture_layer_unittest.cc
+++ b/cc/layers/texture_layer_unittest.cc
@@ -185,7 +185,7 @@
EXPECT_CALL(*layer_tree_host_, SetNeedsCommit()).Times(AnyNumber());
layer_tree_host_->SetRootLayer(NULL);
- layer_tree_host_ = nullptr;
+ layer_tree_host_.reset();
}
scoped_ptr<MockLayerTreeHost> layer_tree_host_;
@@ -422,7 +422,9 @@
SingleReleaseCallback::Create(test_data_.release_mailbox1_)).Pass();
}
- void ReleaseMainRef() { main_ref_ = nullptr; }
+ void ReleaseMainRef() {
+ main_ref_.reset();
+ }
void CreateImplRef(scoped_ptr<SingleReleaseCallbackImpl>* impl_ref) {
*impl_ref = main_ref_->holder()->GetCallbackForImplThread();
@@ -930,7 +932,8 @@
virtual void SetUp() {
TextureLayerTest::SetUp();
layer_tree_host_.reset(new MockLayerTreeHost(&fake_client_));
- EXPECT_TRUE(host_impl_.InitializeRenderer(FakeOutputSurface::Create3d()));
+ EXPECT_TRUE(host_impl_.InitializeRenderer(
+ FakeOutputSurface::Create3d().PassAs<OutputSurface>()));
}
bool WillDraw(TextureLayerImpl* layer, DrawMode mode) {
« no previous file with comments | « cc/layers/texture_layer_impl.cc ('k') | cc/layers/tiled_layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698