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

Side by Side Diff: Source/core/animation/css/CSSAnimations.cpp

Issue 1099483002: Use alias_for with trivial property aliases (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@alias
Patch Set: rebase a couple of tests Created 5 years, 8 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 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 64
65 using PropertySet = HashSet<CSSPropertyID>; 65 using PropertySet = HashSet<CSSPropertyID>;
66 66
67 namespace { 67 namespace {
68 68
69 CSSPropertyID propertyForAnimation(CSSPropertyID property) 69 CSSPropertyID propertyForAnimation(CSSPropertyID property)
70 { 70 {
71 switch (property) { 71 switch (property) {
72 case CSSPropertyWebkitBackgroundSize: 72 case CSSPropertyWebkitBackgroundSize:
73 return CSSPropertyBackgroundSize; 73 return CSSPropertyBackgroundSize;
74 case CSSPropertyWebkitBoxShadow:
75 return CSSPropertyBoxShadow;
76 case CSSPropertyWebkitPerspective: 74 case CSSPropertyWebkitPerspective:
77 return CSSPropertyPerspective; 75 return CSSPropertyPerspective;
78 case CSSPropertyWebkitTransform: 76 case CSSPropertyWebkitTransform:
79 return CSSPropertyTransform; 77 return CSSPropertyTransform;
80 case CSSPropertyWebkitPerspectiveOrigin:
81 return CSSPropertyPerspectiveOrigin;
82 case CSSPropertyWebkitTransformOrigin:
83 return CSSPropertyTransformOrigin;
84 default: 78 default:
85 break; 79 break;
86 } 80 }
87 return property; 81 return property;
88 } 82 }
89 83
90 static PassRefPtrWillBeRawPtr<StringKeyframeEffectModel> createKeyframeEffect(St yleResolver* resolver, const Element* animatingElement, Element& element, const ComputedStyle* style, const ComputedStyle* parentStyle, const AtomicString& name , TimingFunction* defaultTimingFunction) 84 static PassRefPtrWillBeRawPtr<StringKeyframeEffectModel> createKeyframeEffect(St yleResolver* resolver, const Element* animatingElement, Element& element, const ComputedStyle* style, const ComputedStyle* parentStyle, const AtomicString& name , TimingFunction* defaultTimingFunction)
91 { 85 {
92 // When the animating element is null, use its parent for scoping purposes. 86 // When the animating element is null, use its parent for scoping purposes.
93 const Element* elementForScoping = animatingElement ? animatingElement : &el ement; 87 const Element* elementForScoping = animatingElement ? animatingElement : &el ement;
(...skipping 746 matching lines...) Expand 10 before | Expand all | Expand 10 after
840 visitor->trace(m_activeInterpolationsForAnimations); 834 visitor->trace(m_activeInterpolationsForAnimations);
841 visitor->trace(m_activeInterpolationsForTransitions); 835 visitor->trace(m_activeInterpolationsForTransitions);
842 visitor->trace(m_newAnimations); 836 visitor->trace(m_newAnimations);
843 visitor->trace(m_suppressedAnimationPlayers); 837 visitor->trace(m_suppressedAnimationPlayers);
844 visitor->trace(m_animationsWithUpdates); 838 visitor->trace(m_animationsWithUpdates);
845 visitor->trace(m_animationsWithStyleUpdates); 839 visitor->trace(m_animationsWithStyleUpdates);
846 #endif 840 #endif
847 } 841 }
848 842
849 } // namespace blink 843 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/animation/css/CSSAnimatableValueFactory.cpp ('k') | Source/core/animation/css/CSSPropertyEquality.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698