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

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

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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>
11 10
12 namespace blink { 11 namespace blink {
13 12
14 class LegacyStyleInterpolation : public StyleInterpolation { 13 class LegacyStyleInterpolation : public StyleInterpolation {
15 public: 14 public:
16 static PassRefPtr<LegacyStyleInterpolation> create(PassRefPtr<AnimatableValu e> start, PassRefPtr<AnimatableValue> end, CSSPropertyID id) 15 static PassRefPtr<LegacyStyleInterpolation> create(PassRefPtr<AnimatableValu e> start, PassRefPtr<AnimatableValue> end, CSSPropertyID id)
17 { 16 {
18 return adoptRef(new LegacyStyleInterpolation(InterpolableAnimatableValue ::create(start), InterpolableAnimatableValue::create(end), id)); 17 return adoptRef(new LegacyStyleInterpolation(InterpolableAnimatableValue ::create(start), InterpolableAnimatableValue::create(end), id));
19 } 18 }
20 19
21 void apply(StyleResolverState& state) const override 20 void apply(StyleResolverState& state) const override
22 { 21 {
23 AnimatedStyleBuilder::applyProperty(m_id, state, currentValue().get()); 22 AnimatedStyleBuilder::applyProperty(m_id, state, currentValue().get());
24 } 23 }
25 24
26 bool isLegacyStyleInterpolation() const final { return true; } 25 bool isLegacyStyleInterpolation() const final { return true; }
27 PassRefPtr<AnimatableValue> currentValue() const 26 PassRefPtr<AnimatableValue> currentValue() const
28 { 27 {
29 return toInterpolableAnimatableValue(m_cachedValue.get())->value(); 28 return toInterpolableAnimatableValue(m_cachedValue.get())->value();
30 } 29 }
31 30
32 private: 31 private:
33 LegacyStyleInterpolation(std::unique_ptr<InterpolableValue> start, std::uniq ue_ptr<InterpolableValue> end, CSSPropertyID id) 32 LegacyStyleInterpolation(PassOwnPtr<InterpolableValue> start, PassOwnPtr<Int erpolableValue> end, CSSPropertyID id)
34 : StyleInterpolation(std::move(start), std::move(end), id) 33 : StyleInterpolation(std::move(start), std::move(end), id)
35 { 34 {
36 } 35 }
37 }; 36 };
38 37
39 DEFINE_TYPE_CASTS(LegacyStyleInterpolation, Interpolation, value, value->isLegac yStyleInterpolation(), value.isLegacyStyleInterpolation()); 38 DEFINE_TYPE_CASTS(LegacyStyleInterpolation, Interpolation, value, value->isLegac yStyleInterpolation(), value.isLegacyStyleInterpolation());
40 39
41 } // namespace blink 40 } // namespace blink
42 41
43 #endif 42 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698