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

Side by Side Diff: third_party/WebKit/Source/core/animation/LegacyStyleInterpolation.h

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef LegacyStyleInterpolation_h 5 #ifndef LegacyStyleInterpolation_h
6 #define LegacyStyleInterpolation_h 6 #define LegacyStyleInterpolation_h
7 7
8 #include "core/animation/StyleInterpolation.h" 8 #include "core/animation/StyleInterpolation.h"
9 #include "core/css/resolver/AnimatedStyleBuilder.h" 9 #include "core/css/resolver/AnimatedStyleBuilder.h"
10 #include <memory>
10 11
11 namespace blink { 12 namespace blink {
12 13
13 class LegacyStyleInterpolation : public StyleInterpolation { 14 class LegacyStyleInterpolation : public StyleInterpolation {
14 public: 15 public:
15 static PassRefPtr<LegacyStyleInterpolation> create(PassRefPtr<AnimatableValu e> start, PassRefPtr<AnimatableValue> end, CSSPropertyID id) 16 static PassRefPtr<LegacyStyleInterpolation> create(PassRefPtr<AnimatableValu e> start, PassRefPtr<AnimatableValue> end, CSSPropertyID id)
16 { 17 {
17 return adoptRef(new LegacyStyleInterpolation(InterpolableAnimatableValue ::create(start), InterpolableAnimatableValue::create(end), id)); 18 return adoptRef(new LegacyStyleInterpolation(InterpolableAnimatableValue ::create(start), InterpolableAnimatableValue::create(end), id));
18 } 19 }
19 20
20 void apply(StyleResolverState& state) const override 21 void apply(StyleResolverState& state) const override
21 { 22 {
22 AnimatedStyleBuilder::applyProperty(m_id, state, currentValue().get()); 23 AnimatedStyleBuilder::applyProperty(m_id, state, currentValue().get());
23 } 24 }
24 25
25 bool isLegacyStyleInterpolation() const final { return true; } 26 bool isLegacyStyleInterpolation() const final { return true; }
26 PassRefPtr<AnimatableValue> currentValue() const 27 PassRefPtr<AnimatableValue> currentValue() const
27 { 28 {
28 return toInterpolableAnimatableValue(m_cachedValue.get())->value(); 29 return toInterpolableAnimatableValue(m_cachedValue.get())->value();
29 } 30 }
30 31
31 private: 32 private:
32 LegacyStyleInterpolation(PassOwnPtr<InterpolableValue> start, PassOwnPtr<Int erpolableValue> end, CSSPropertyID id) 33 LegacyStyleInterpolation(std::unique_ptr<InterpolableValue> start, std::uniq ue_ptr<InterpolableValue> end, CSSPropertyID id)
33 : StyleInterpolation(std::move(start), std::move(end), id) 34 : StyleInterpolation(std::move(start), std::move(end), id)
34 { 35 {
35 } 36 }
36 }; 37 };
37 38
38 DEFINE_TYPE_CASTS(LegacyStyleInterpolation, Interpolation, value, value->isLegac yStyleInterpolation(), value.isLegacyStyleInterpolation()); 39 DEFINE_TYPE_CASTS(LegacyStyleInterpolation, Interpolation, value, value->isLegac yStyleInterpolation(), value.isLegacyStyleInterpolation());
39 40
40 } // namespace blink 41 } // namespace blink
41 42
42 #endif 43 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698