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

Side by Side Diff: Source/core/rendering/style/RenderStyle.cpp

Issue 14391005: Rename Animation -> PrimitiveAnimation (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Update to long paths Created 7 years, 7 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/rendering/style/RenderStyle.h ('k') | no next file » | 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 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. 4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 1122 matching lines...) Expand 10 before | Expand all | Expand 10 after
1133 return rareNonInheritedData->m_animations.get(); 1133 return rareNonInheritedData->m_animations.get();
1134 } 1134 }
1135 1135
1136 AnimationList* RenderStyle::accessTransitions() 1136 AnimationList* RenderStyle::accessTransitions()
1137 { 1137 {
1138 if (!rareNonInheritedData.access()->m_transitions) 1138 if (!rareNonInheritedData.access()->m_transitions)
1139 rareNonInheritedData.access()->m_transitions = adoptPtr(new AnimationLis t()); 1139 rareNonInheritedData.access()->m_transitions = adoptPtr(new AnimationLis t());
1140 return rareNonInheritedData->m_transitions.get(); 1140 return rareNonInheritedData->m_transitions.get();
1141 } 1141 }
1142 1142
1143 const Animation* RenderStyle::transitionForProperty(CSSPropertyID property) cons t 1143 const CSSAnimationData* RenderStyle::transitionForProperty(CSSPropertyID propert y) const
1144 { 1144 {
1145 if (transitions()) { 1145 if (transitions()) {
1146 for (size_t i = 0; i < transitions()->size(); ++i) { 1146 for (size_t i = 0; i < transitions()->size(); ++i) {
1147 const Animation* p = transitions()->animation(i); 1147 const CSSAnimationData* p = transitions()->animation(i);
1148 if (p->animationMode() == Animation::AnimateAll || p->property() == property) { 1148 if (p->animationMode() == CSSAnimationData::AnimateAll || p->propert y() == property) {
1149 return p; 1149 return p;
1150 } 1150 }
1151 } 1151 }
1152 } 1152 }
1153 return 0; 1153 return 0;
1154 } 1154 }
1155 1155
1156 const Font& RenderStyle::font() const { return inherited->font; } 1156 const Font& RenderStyle::font() const { return inherited->font; }
1157 const FontMetrics& RenderStyle::fontMetrics() const { return inherited->font.fon tMetrics(); } 1157 const FontMetrics& RenderStyle::fontMetrics() const { return inherited->font.fon tMetrics(); }
1158 const FontDescription& RenderStyle::fontDescription() const { return inherited-> font.fontDescription(); } 1158 const FontDescription& RenderStyle::fontDescription() const { return inherited-> font.fontDescription(); }
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after
1585 info.addMember(inherited, "inherited"); 1585 info.addMember(inherited, "inherited");
1586 info.addMember(m_cachedPseudoStyles, "cachedPseudoStyles"); 1586 info.addMember(m_cachedPseudoStyles, "cachedPseudoStyles");
1587 #if ENABLE(SVG) 1587 #if ENABLE(SVG)
1588 info.addMember(m_svgStyle, "svgStyle"); 1588 info.addMember(m_svgStyle, "svgStyle");
1589 #endif 1589 #endif
1590 info.addMember(inherited_flags, "inherited_flags"); 1590 info.addMember(inherited_flags, "inherited_flags");
1591 info.addMember(noninherited_flags, "noninherited_flags"); 1591 info.addMember(noninherited_flags, "noninherited_flags");
1592 } 1592 }
1593 1593
1594 } // namespace WebCore 1594 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/style/RenderStyle.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698