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

Side by Side Diff: third_party/WebKit/Source/core/animation/css/CSSAnimationData.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 CSSAnimationData_h 5 #ifndef CSSAnimationData_h
6 #define CSSAnimationData_h 6 #define CSSAnimationData_h
7 7
8 #include "core/animation/Timing.h" 8 #include "core/animation/Timing.h"
9 #include "core/animation/css/CSSTimingData.h" 9 #include "core/animation/css/CSSTimingData.h"
10 #include "core/style/ComputedStyleConstants.h" 10 #include "core/style/ComputedStyleConstants.h"
11 #include "wtf/PtrUtil.h"
12 #include <memory>
13 11
14 namespace blink { 12 namespace blink {
15 13
16 class CSSAnimationData final : public CSSTimingData { 14 class CSSAnimationData final : public CSSTimingData {
17 public: 15 public:
18 static std::unique_ptr<CSSAnimationData> create() 16 static PassOwnPtr<CSSAnimationData> create()
19 { 17 {
20 return wrapUnique(new CSSAnimationData); 18 return adoptPtr(new CSSAnimationData);
21 } 19 }
22 20
23 static std::unique_ptr<CSSAnimationData> create(const CSSAnimationData& anim ationData) 21 static PassOwnPtr<CSSAnimationData> create(const CSSAnimationData& animation Data)
24 { 22 {
25 return wrapUnique(new CSSAnimationData(animationData)); 23 return adoptPtr(new CSSAnimationData(animationData));
26 } 24 }
27 25
28 bool animationsMatchForStyleRecalc(const CSSAnimationData& other) const; 26 bool animationsMatchForStyleRecalc(const CSSAnimationData& other) const;
29 27
30 Timing convertToTiming(size_t index) const; 28 Timing convertToTiming(size_t index) const;
31 29
32 const Vector<AtomicString>& nameList() const { return m_nameList; } 30 const Vector<AtomicString>& nameList() const { return m_nameList; }
33 const Vector<double>& iterationCountList() const { return m_iterationCountLi st; } 31 const Vector<double>& iterationCountList() const { return m_iterationCountLi st; }
34 const Vector<Timing::PlaybackDirection>& directionList() const { return m_di rectionList; } 32 const Vector<Timing::PlaybackDirection>& directionList() const { return m_di rectionList; }
35 const Vector<Timing::FillMode>& fillModeList() const { return m_fillModeList ; } 33 const Vector<Timing::FillMode>& fillModeList() const { return m_fillModeList ; }
(...skipping 18 matching lines...) Expand all
54 Vector<AtomicString> m_nameList; 52 Vector<AtomicString> m_nameList;
55 Vector<double> m_iterationCountList; 53 Vector<double> m_iterationCountList;
56 Vector<Timing::PlaybackDirection> m_directionList; 54 Vector<Timing::PlaybackDirection> m_directionList;
57 Vector<Timing::FillMode> m_fillModeList; 55 Vector<Timing::FillMode> m_fillModeList;
58 Vector<EAnimPlayState> m_playStateList; 56 Vector<EAnimPlayState> m_playStateList;
59 }; 57 };
60 58
61 } // namespace blink 59 } // namespace blink
62 60
63 #endif // CSSAnimationData_h 61 #endif // CSSAnimationData_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698