diff options
author | danakj <danakj@chromium.org> | 2014-09-27 14:55:48 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-09-27 21:56:07 +0000 |
commit | f446a070a0aa29a153b0cf78b33ef22da84cb023 (patch) | |
tree | 58723080156284eca6c914ec067cbf93afac948b /cc/test/layer_test_common.cc | |
parent | ea60a8e76d887c6b22acc495e5ea3c28540ae2ef (diff) | |
download | chromium_src-f446a070a0aa29a153b0cf78b33ef22da84cb023.zip chromium_src-f446a070a0aa29a153b0cf78b33ef22da84cb023.tar.gz chromium_src-f446a070a0aa29a153b0cf78b33ef22da84cb023.tar.bz2 |
cc: Remove use of PassAs() and constructor-casting with scoped_ptr.
Say you have class A and subclass B.
Previously it was required to PassAs() a scoped_ptr<B> into a
scoped_ptr<A>. This is no longer needed, so just use Pass(). For newly
created scoped_ptrs, you can just use make_scoped_ptr always now.
And when you want to return or assign an empty scoped_ptr(), you can
now use nullptr directly.
Also adds PRESUBMIT checks for:
- return scoped<T>(foo). This should be return make_scoped_ptr(foo).
- bar = scoped<T>(foo). This should be return bar = make_scoped_ptr(foo).
- return scoped<T>(). This should be return nullptr.
- bar = scoped<T>(). This should be return bar = nullptr.
This also replaces p.reset() with p = nullptr; But it does not add a
PRESUBMIT check for that because there are things other than scoped_ptr
with a reset() function.
R=enne@chromium.org
Committed: https://crrev.com/7bb3dbede19d87f0338797756ffd738adc6bca08
Cr-Commit-Position: refs/heads/master@{#297096}
Review URL: https://codereview.chromium.org/609663003
Cr-Commit-Position: refs/heads/master@{#297121}
Diffstat (limited to 'cc/test/layer_test_common.cc')
-rw-r--r-- | cc/test/layer_test_common.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cc/test/layer_test_common.cc b/cc/test/layer_test_common.cc index be3606f..2870887 100644 --- a/cc/test/layer_test_common.cc +++ b/cc/test/layer_test_common.cc @@ -112,8 +112,7 @@ LayerTestCommon::LayerImplTest::LayerImplTest() root_layer_impl_(LayerImpl::Create(host_->host_impl()->active_tree(), 1)), render_pass_(RenderPass::Create()) { scoped_ptr<FakeOutputSurface> output_surface = FakeOutputSurface::Create3d(); - host_->host_impl()->InitializeRenderer( - output_surface.PassAs<OutputSurface>()); + host_->host_impl()->InitializeRenderer(FakeOutputSurface::Create3d()); } LayerTestCommon::LayerImplTest::~LayerImplTest() {} |