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

Side by Side Diff: Source/core/css/CSSProperty.h

Issue 415613002: Merge CSSPropertyNames.in and SVGCSSPropertyNames.in with CSSProperties.in (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: fix crash without experimental flag Created 6 years, 4 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
« no previous file with comments | « Source/core/css/CSSProperties.in ('k') | Source/core/css/CSSPropertyNames.in » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * (C) 1999-2003 Lars Knoll (knoll@kde.org) 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. 3 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 85
86 void trace(Visitor* visitor) { visitor->trace(m_value); } 86 void trace(Visitor* visitor) { visitor->trace(m_value); }
87 87
88 private: 88 private:
89 StylePropertyMetadata m_metadata; 89 StylePropertyMetadata m_metadata;
90 RefPtrWillBeMember<CSSValue> m_value; 90 RefPtrWillBeMember<CSSValue> m_value;
91 }; 91 };
92 92
93 inline CSSPropertyID prefixingVariantForPropertyId(CSSPropertyID propId) 93 inline CSSPropertyID prefixingVariantForPropertyId(CSSPropertyID propId)
94 { 94 {
95 if (!RuntimeEnabledFeatures::cssAnimationUnprefixedEnabled() && (propId >= C SSPropertyWebkitAnimation && propId <= CSSPropertyAnimationTimingFunction)) 95 if (!RuntimeEnabledFeatures::cssAnimationUnprefixedEnabled())
96 return propId; 96 return propId;
97 97
98 CSSPropertyID propertyId = CSSPropertyInvalid; 98 CSSPropertyID propertyId = CSSPropertyInvalid;
99 switch (propId) { 99 switch (propId) {
100 case CSSPropertyAnimation: 100 case CSSPropertyAnimation:
101 propertyId = CSSPropertyWebkitAnimation; 101 propertyId = CSSPropertyWebkitAnimation;
102 break; 102 break;
103 case CSSPropertyAnimationDelay: 103 case CSSPropertyAnimationDelay:
104 propertyId = CSSPropertyWebkitAnimationDelay; 104 propertyId = CSSPropertyWebkitAnimationDelay;
105 break; 105 break;
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 } 187 }
188 ASSERT(propertyId != CSSPropertyInvalid); 188 ASSERT(propertyId != CSSPropertyInvalid);
189 return propertyId; 189 return propertyId;
190 } 190 }
191 191
192 } // namespace blink 192 } // namespace blink
193 193
194 WTF_ALLOW_MOVE_AND_INIT_WITH_MEM_FUNCTIONS(blink::CSSProperty); 194 WTF_ALLOW_MOVE_AND_INIT_WITH_MEM_FUNCTIONS(blink::CSSProperty);
195 195
196 #endif // CSSProperty_h 196 #endif // CSSProperty_h
OLDNEW
« no previous file with comments | « Source/core/css/CSSProperties.in ('k') | Source/core/css/CSSPropertyNames.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698