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

Side by Side Diff: third_party/WebKit/Source/core/animation/StyleInterpolation.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 StyleInterpolation_h 5 #ifndef StyleInterpolation_h
6 #define StyleInterpolation_h 6 #define StyleInterpolation_h
7 7
8 #include "core/CSSPropertyNames.h" 8 #include "core/CSSPropertyNames.h"
9 #include "core/CoreExport.h" 9 #include "core/CoreExport.h"
10 #include "core/animation/Interpolation.h" 10 #include "core/animation/Interpolation.h"
11 #include "core/animation/PropertyHandle.h" 11 #include "core/animation/PropertyHandle.h"
12 #include <memory>
13 12
14 namespace blink { 13 namespace blink {
15 14
16 class StyleResolverState; 15 class StyleResolverState;
17 16
18 enum InterpolationRange { 17 enum InterpolationRange {
19 RangeAll, 18 RangeAll,
20 RangeFloor, 19 RangeFloor,
21 RangeGreaterThanOrEqualToOne, 20 RangeGreaterThanOrEqualToOne,
22 RangeNonNegative, 21 RangeNonNegative,
(...skipping 18 matching lines...) Expand all
41 CSSPropertyID id() const { return m_id; } 40 CSSPropertyID id() const { return m_id; }
42 41
43 PropertyHandle getProperty() const final 42 PropertyHandle getProperty() const final
44 { 43 {
45 return PropertyHandle(id()); 44 return PropertyHandle(id());
46 } 45 }
47 46
48 protected: 47 protected:
49 CSSPropertyID m_id; 48 CSSPropertyID m_id;
50 49
51 StyleInterpolation(std::unique_ptr<InterpolableValue> start, std::unique_ptr <InterpolableValue> end, CSSPropertyID id) 50 StyleInterpolation(PassOwnPtr<InterpolableValue> start, PassOwnPtr<Interpola bleValue> end, CSSPropertyID id)
52 : Interpolation(std::move(start), std::move(end)) 51 : Interpolation(std::move(start), std::move(end))
53 , m_id(id) 52 , m_id(id)
54 { 53 {
55 } 54 }
56 }; 55 };
57 56
58 DEFINE_TYPE_CASTS(StyleInterpolation, Interpolation, value, value->isStyleInterp olation(), value.isStyleInterpolation()); 57 DEFINE_TYPE_CASTS(StyleInterpolation, Interpolation, value, value->isStyleInterp olation(), value.isStyleInterpolation());
59 58
60 } // namespace blink 59 } // namespace blink
61 60
62 #endif 61 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698