summaryrefslogtreecommitdiffstats
path: root/cc/layers/ui_resource_layer_impl.cc
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2014-09-27 00:33:06 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-27 07:33:30 +0000
commit78d5331bcd375f8c8f0285d648dc30cc4f206367 (patch)
treeafc3c9100269d4dab67803ed9650f4a4d6baba23 /cc/layers/ui_resource_layer_impl.cc
parent67f01ddf1bc44927cbe10bcc000bf8eec462c1fc (diff)
downloadchromium_src-78d5331bcd375f8c8f0285d648dc30cc4f206367.zip
chromium_src-78d5331bcd375f8c8f0285d648dc30cc4f206367.tar.gz
chromium_src-78d5331bcd375f8c8f0285d648dc30cc4f206367.tar.bz2
Revert of cc: Remove use of PassAs() and constructor-casting with scoped_ptr. (patchset #6 id:120001 of https://codereview.chromium.org/609663003/)
Reason for revert: scoped_ptr nullptr support needs to be reverted Original issue's description: > 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} TBR=enne@chromium.org,jamesr@chromium.org,vmpstr@chromium.org,danakj@chromium.org NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/608503005 Cr-Commit-Position: refs/heads/master@{#297106}
Diffstat (limited to 'cc/layers/ui_resource_layer_impl.cc')
-rw-r--r--cc/layers/ui_resource_layer_impl.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/cc/layers/ui_resource_layer_impl.cc b/cc/layers/ui_resource_layer_impl.cc
index 8a7d3df..98843c6 100644
--- a/cc/layers/ui_resource_layer_impl.cc
+++ b/cc/layers/ui_resource_layer_impl.cc
@@ -29,7 +29,7 @@ UIResourceLayerImpl::~UIResourceLayerImpl() {}
scoped_ptr<LayerImpl> UIResourceLayerImpl::CreateLayerImpl(
LayerTreeImpl* tree_impl) {
- return UIResourceLayerImpl::Create(tree_impl, id());
+ return UIResourceLayerImpl::Create(tree_impl, id()).PassAs<LayerImpl>();
}
void UIResourceLayerImpl::PushPropertiesTo(LayerImpl* layer) {