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

Unified Diff: cc/layers/layer.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/io_surface_layer_impl.cc ('k') | cc/layers/layer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/layer.cc
diff --git a/cc/layers/layer.cc b/cc/layers/layer.cc
index 1326b797c940cd60b54e2ba0d51fe21e9f4b0e03..1a22d9254a9b5bded9b1560c4769760efa57779d 100644
--- a/cc/layers/layer.cc
+++ b/cc/layers/layer.cc
@@ -620,7 +620,7 @@
void Layer::RemoveScrollChild(Layer* child) {
scroll_children_->erase(child);
if (scroll_children_->empty())
- scroll_children_ = nullptr;
+ scroll_children_.reset();
SetNeedsCommit();
}
@@ -650,7 +650,7 @@
void Layer::RemoveClipChild(Layer* child) {
clip_children_->erase(child);
if (clip_children_->empty())
- clip_children_ = nullptr;
+ clip_children_.reset();
SetNeedsCommit();
}
@@ -1085,7 +1085,7 @@
}
void Layer::ClearRenderSurface() {
- draw_properties_.render_surface = nullptr;
+ draw_properties_.render_surface.reset();
}
void Layer::ClearRenderSurfaceLayerList() {
« no previous file with comments | « cc/layers/io_surface_layer_impl.cc ('k') | cc/layers/layer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698