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

Unified Diff: cc/trees/layer_tree_host_impl.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/trees/layer_tree_host_common_unittest.cc ('k') | cc/trees/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_impl.cc
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index 5771bbbba3fa1aa6c57f83a93315be668cc43bdc..29e29c34c78ceff1a537116ab46794c88e108e4c 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -309,9 +309,9 @@
if (pending_tree_)
pending_tree_->Shutdown();
active_tree_->Shutdown();
- recycle_tree_ = nullptr;
- pending_tree_ = nullptr;
- active_tree_ = nullptr;
+ recycle_tree_.reset();
+ pending_tree_.reset();
+ active_tree_.reset();
DestroyTileManager();
}
@@ -446,7 +446,7 @@
// Easing constants experimentally determined.
scoped_ptr<TimingFunction> timing_function =
- CubicBezierTimingFunction::Create(.8, 0, .3, .9);
+ CubicBezierTimingFunction::Create(.8, 0, .3, .9).PassAs<TimingFunction>();
page_scale_animation_ =
PageScaleAnimation::Create(scroll_total,
@@ -506,7 +506,7 @@
scoped_ptr<SwapPromiseMonitor>
LayerTreeHostImpl::CreateLatencyInfoSwapPromiseMonitor(
ui::LatencyInfo* latency) {
- return make_scoped_ptr(
+ return scoped_ptr<SwapPromiseMonitor>(
new LatencyInfoSwapPromiseMonitor(latency, NULL, this));
}
@@ -1171,16 +1171,16 @@
active_tree_ = LayerTreeImpl::create(this);
if (pending_tree_)
pending_tree_->DetachLayerTree();
- pending_tree_ = nullptr;
+ pending_tree_.reset();
if (recycle_tree_)
recycle_tree_->DetachLayerTree();
- recycle_tree_ = nullptr;
+ recycle_tree_.reset();
}
void LayerTreeHostImpl::ResetRecycleTreeForTesting() {
if (recycle_tree_)
recycle_tree_->DetachLayerTree();
- recycle_tree_ = nullptr;
+ recycle_tree_.reset();
}
void LayerTreeHostImpl::EnforceManagedMemoryPolicy(
@@ -2041,10 +2041,10 @@
}
void LayerTreeHostImpl::DestroyTileManager() {
- tile_manager_ = nullptr;
- resource_pool_ = nullptr;
- staging_resource_pool_ = nullptr;
- raster_worker_pool_ = nullptr;
+ tile_manager_.reset();
+ resource_pool_.reset();
+ staging_resource_pool_.reset();
+ raster_worker_pool_.reset();
}
bool LayerTreeHostImpl::UsePendingTreeForSync() const {
@@ -2077,10 +2077,10 @@
ReleaseTreeResources();
// Note: order is important here.
- renderer_ = nullptr;
+ renderer_.reset();
DestroyTileManager();
- resource_provider_ = nullptr;
- output_surface_ = nullptr;
+ resource_provider_.reset();
+ output_surface_.reset();
if (!output_surface->BindToClient(this))
return false;
@@ -2142,7 +2142,7 @@
DCHECK(output_surface_->context_provider());
ReleaseTreeResources();
- renderer_ = nullptr;
+ renderer_.reset();
DestroyTileManager();
resource_provider_->InitializeGL();
@@ -2160,7 +2160,7 @@
DCHECK(output_surface_->context_provider());
ReleaseTreeResources();
- renderer_ = nullptr;
+ renderer_.reset();
DestroyTileManager();
resource_provider_->InitializeSoftware();
@@ -2428,7 +2428,7 @@
curve->SetInitialValue(current_offset);
scoped_ptr<Animation> animation =
- Animation::Create(curve.Pass(),
+ Animation::Create(curve.PassAs<AnimationCurve>(),
AnimationIdProvider::NextAnimationId(),
AnimationIdProvider::NextGroupId(),
Animation::ScrollOffset);
@@ -2992,7 +2992,7 @@
SetNeedsRedraw();
if (page_scale_animation_->IsAnimationCompleteAtTime(monotonic_time)) {
- page_scale_animation_ = nullptr;
+ page_scale_animation_.reset();
client_->SetNeedsCommitOnImplThread();
client_->RenewTreePriority();
} else {
« no previous file with comments | « cc/trees/layer_tree_host_common_unittest.cc ('k') | cc/trees/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698