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

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

Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)
Patch Set: Rebasing... Created 4 years 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 CSSTransitionData_h 5 #ifndef CSSTransitionData_h
6 #define CSSTransitionData_h 6 #define CSSTransitionData_h
7 7
8 #include "core/CSSPropertyNames.h" 8 #include "core/CSSPropertyNames.h"
9 #include "core/animation/css/CSSTimingData.h" 9 #include "core/animation/css/CSSTimingData.h"
10 #include "wtf/PtrUtil.h" 10 #include "wtf/PtrUtil.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 unresolvedProperty == other.unresolvedProperty && 44 unresolvedProperty == other.unresolvedProperty &&
45 propertyString == other.propertyString; 45 propertyString == other.propertyString;
46 } 46 }
47 47
48 TransitionPropertyType propertyType; 48 TransitionPropertyType propertyType;
49 CSSPropertyID unresolvedProperty; 49 CSSPropertyID unresolvedProperty;
50 AtomicString propertyString; 50 AtomicString propertyString;
51 }; 51 };
52 52
53 static std::unique_ptr<CSSTransitionData> create() { 53 static std::unique_ptr<CSSTransitionData> create() {
54 return wrapUnique(new CSSTransitionData); 54 return WTF::wrapUnique(new CSSTransitionData);
55 } 55 }
56 56
57 static std::unique_ptr<CSSTransitionData> create( 57 static std::unique_ptr<CSSTransitionData> create(
58 const CSSTransitionData& transitionData) { 58 const CSSTransitionData& transitionData) {
59 return wrapUnique(new CSSTransitionData(transitionData)); 59 return WTF::wrapUnique(new CSSTransitionData(transitionData));
60 } 60 }
61 61
62 bool transitionsMatchForStyleRecalc(const CSSTransitionData& other) const; 62 bool transitionsMatchForStyleRecalc(const CSSTransitionData& other) const;
63 63
64 Timing convertToTiming(size_t index) const; 64 Timing convertToTiming(size_t index) const;
65 65
66 const Vector<TransitionProperty>& propertyList() const { 66 const Vector<TransitionProperty>& propertyList() const {
67 return m_propertyList; 67 return m_propertyList;
68 } 68 }
69 Vector<TransitionProperty>& propertyList() { return m_propertyList; } 69 Vector<TransitionProperty>& propertyList() { return m_propertyList; }
70 70
71 static TransitionProperty initialProperty() { 71 static TransitionProperty initialProperty() {
72 return TransitionProperty(CSSPropertyAll); 72 return TransitionProperty(CSSPropertyAll);
73 } 73 }
74 74
75 private: 75 private:
76 CSSTransitionData(); 76 CSSTransitionData();
77 explicit CSSTransitionData(const CSSTransitionData&); 77 explicit CSSTransitionData(const CSSTransitionData&);
78 78
79 Vector<TransitionProperty> m_propertyList; 79 Vector<TransitionProperty> m_propertyList;
80 }; 80 };
81 81
82 } // namespace blink 82 } // namespace blink
83 83
84 #endif // CSSTransitionData_h 84 #endif // CSSTransitionData_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698