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

Unified Diff: ui/compositor/scoped_layer_animation_settings.cc

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr 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 | « ui/compositor/scoped_layer_animation_settings.h ('k') | ui/compositor/test/draw_waiter_for_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/scoped_layer_animation_settings.cc
diff --git a/ui/compositor/scoped_layer_animation_settings.cc b/ui/compositor/scoped_layer_animation_settings.cc
index 2b3211ae8a929983ecf6431054edf5721103d5d1..912d8bd5ff54e6e3f19e6baa67d38a1929da43cd 100644
--- a/ui/compositor/scoped_layer_animation_settings.cc
+++ b/ui/compositor/scoped_layer_animation_settings.cc
@@ -43,8 +43,8 @@ class InvertingObserver : public ImplicitAnimationObserver {
<< "Must set base layer with ScopedLayerAnimationSettings::"
<< "SetInverslyAnimatedBaseLayer";
gfx::Transform base_transform = base_layer_->transform();
- scoped_ptr<LayerAnimationElement> inverse = GetInverseElement(sequence,
- base_transform);
+ std::unique_ptr<LayerAnimationElement> inverse =
+ GetInverseElement(sequence, base_transform);
for (std::vector<Layer*>::const_iterator i =
inverse_layers_.begin(); i != inverse_layers_.end(); ++i) {
@@ -54,22 +54,22 @@ class InvertingObserver : public ImplicitAnimationObserver {
}
}
private:
- scoped_ptr<LayerAnimationElement> GetInverseElement(
- LayerAnimationSequence* sequence,
- gfx::Transform base) const {
- const size_t expected_size = 1;
- DCHECK_EQ(expected_size, sequence->size()) <<
- "Inverse supported only for single element sequences.";
-
- LayerAnimationElement* element = sequence->FirstElement();
- DCHECK_EQ(static_cast<LayerAnimationElement::AnimatableProperties>(
- LayerAnimationElement::TRANSFORM),
- element->properties())
- << "Only transform animations are currently invertible.";
-
- scoped_ptr<LayerAnimationElement> to_return(
- LayerAnimationElement::CreateInverseTransformElement(base, element));
- return to_return;
+ std::unique_ptr<LayerAnimationElement> GetInverseElement(
+ LayerAnimationSequence* sequence,
+ gfx::Transform base) const {
+ const size_t expected_size = 1;
+ DCHECK_EQ(expected_size, sequence->size())
+ << "Inverse supported only for single element sequences.";
+
+ LayerAnimationElement* element = sequence->FirstElement();
+ DCHECK_EQ(static_cast<LayerAnimationElement::AnimatableProperties>(
+ LayerAnimationElement::TRANSFORM),
+ element->properties())
+ << "Only transform animations are currently invertible.";
+
+ std::unique_ptr<LayerAnimationElement> to_return(
+ LayerAnimationElement::CreateInverseTransformElement(base, element));
+ return to_return;
}
Layer* base_layer_;
« no previous file with comments | « ui/compositor/scoped_layer_animation_settings.h ('k') | ui/compositor/test/draw_waiter_for_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698