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

Unified Diff: cc/layers/layer_impl.cc

Issue 609663003: cc: Remove use of PassAs() and constructor-casting with scoped_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cc-passas: PassAs-presubmit-warning 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/layer.cc ('k') | cc/layers/layer_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/layer_impl.cc
diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc
index 29bdfe778fdf522fc9a3a8f97d74ef4adb90b71c..224513c2a59f0ee51476eeed69a91a31249b4737 100644
--- a/cc/layers/layer_impl.cc
+++ b/cc/layers/layer_impl.cc
@@ -119,7 +119,7 @@ scoped_ptr<LayerImpl> LayerImpl::RemoveChild(LayerImpl* child) {
return ret.Pass();
}
}
- return scoped_ptr<LayerImpl>();
+ return nullptr;
}
void LayerImpl::SetParent(LayerImpl* parent) {
@@ -246,7 +246,7 @@ void LayerImpl::CreateRenderSurface() {
}
void LayerImpl::ClearRenderSurface() {
- draw_properties_.render_surface.reset();
+ draw_properties_.render_surface = nullptr;
}
void LayerImpl::ClearRenderSurfaceLayerList() {
@@ -1324,7 +1324,7 @@ void LayerImpl::DidBecomeActive() {
bool need_scrollbar_animation_controller = scrollable() && scrollbars_;
if (!need_scrollbar_animation_controller) {
- scrollbar_animation_controller_.reset();
+ scrollbar_animation_controller_ = nullptr;
return;
}
@@ -1358,7 +1358,7 @@ void LayerImpl::RemoveScrollbar(ScrollbarLayerImplBase* layer) {
scrollbars_->erase(layer);
if (scrollbars_->empty())
- scrollbars_.reset();
+ scrollbars_ = nullptr;
}
bool LayerImpl::HasScrollbar(ScrollbarOrientation orientation) const {
« no previous file with comments | « cc/layers/layer.cc ('k') | cc/layers/layer_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698