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

Unified Diff: cc/animation/element_animations.cc

Issue 1866203004: Convert //cc from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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/animation/element_animations.h ('k') | cc/animation/keyframed_animation_curve.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/animation/element_animations.cc
diff --git a/cc/animation/element_animations.cc b/cc/animation/element_animations.cc
index 6a9dc33dc5da7113ffbf128a74eb521e4eb7f1dd..73a34a07badac0ea6855a537c2e5d5b7b9238236 100644
--- a/cc/animation/element_animations.cc
+++ b/cc/animation/element_animations.cc
@@ -5,6 +5,7 @@
#include "cc/animation/element_animations.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "cc/animation/animation_host.h"
#include "cc/animation/animation_player.h"
#include "cc/animation/animation_registrar.h"
@@ -56,12 +57,14 @@ class ElementAnimations::ValueObserver : public LayerAnimationValueObserver {
DISALLOW_COPY_AND_ASSIGN(ValueObserver);
};
-scoped_ptr<ElementAnimations> ElementAnimations::Create(AnimationHost* host) {
- return make_scoped_ptr(new ElementAnimations(host));
+std::unique_ptr<ElementAnimations> ElementAnimations::Create(
+ AnimationHost* host) {
+ return base::WrapUnique(new ElementAnimations(host));
}
ElementAnimations::ElementAnimations(AnimationHost* host)
- : players_list_(make_scoped_ptr(new PlayersList())), animation_host_(host) {
+ : players_list_(base::WrapUnique(new PlayersList())),
vmpstr 2016/04/08 00:53:55 I don't think you need this?
danakj 2016/04/08 00:59:01 Done.
+ animation_host_(host) {
DCHECK(animation_host_);
}
@@ -211,7 +214,7 @@ void ElementAnimations::CreateActiveValueObserver() {
DCHECK(layer_animation_controller_);
DCHECK(!active_value_observer_);
active_value_observer_ =
- make_scoped_ptr(new ValueObserver(this, LayerTreeType::ACTIVE));
+ base::WrapUnique(new ValueObserver(this, LayerTreeType::ACTIVE));
layer_animation_controller_->AddValueObserver(active_value_observer_.get());
}
@@ -226,7 +229,7 @@ void ElementAnimations::CreatePendingValueObserver() {
DCHECK(layer_animation_controller_);
DCHECK(!pending_value_observer_);
pending_value_observer_ =
- make_scoped_ptr(new ValueObserver(this, LayerTreeType::PENDING));
+ base::WrapUnique(new ValueObserver(this, LayerTreeType::PENDING));
layer_animation_controller_->AddValueObserver(pending_value_observer_.get());
}
@@ -274,11 +277,11 @@ void ElementAnimations::NotifyAnimationTakeover(
base::TimeTicks monotonic_time,
TargetProperty::Type target_property,
double animation_start_time,
- scoped_ptr<AnimationCurve> curve) {
+ std::unique_ptr<AnimationCurve> curve) {
DCHECK(curve);
for (PlayersListNode* node = players_list_->head();
node != players_list_->end(); node = node->next()) {
- scoped_ptr<AnimationCurve> animation_curve = curve->Clone();
+ std::unique_ptr<AnimationCurve> animation_curve = curve->Clone();
AnimationPlayer* player = node->value();
player->NotifyAnimationTakeover(monotonic_time, target_property,
animation_start_time,
« no previous file with comments | « cc/animation/element_animations.h ('k') | cc/animation/keyframed_animation_curve.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698