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

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

Issue 454423003: Add animatable flag to CSSProperties.in (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 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
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 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 WTF_MAKE_NONCOPYABLE(CSSAnimations); 163 WTF_MAKE_NONCOPYABLE(CSSAnimations);
164 DISALLOW_ALLOCATION(); 164 DISALLOW_ALLOCATION();
165 public: 165 public:
166 CSSAnimations(); 166 CSSAnimations();
167 167
168 // FIXME: This method is only used here and in the legacy animations 168 // FIXME: This method is only used here and in the legacy animations
169 // implementation. It should be made private or file-scope when the legacy 169 // implementation. It should be made private or file-scope when the legacy
170 // engine is removed. 170 // engine is removed.
171 static const StyleRuleKeyframes* matchScopedKeyframesRule(StyleResolver*, co nst Element*, const StringImpl*); 171 static const StyleRuleKeyframes* matchScopedKeyframesRule(StyleResolver*, co nst Element*, const StringImpl*);
172 172
173 static bool isAnimatableProperty(CSSPropertyID);
174 static const StylePropertyShorthand& animatableProperties(); 173 static const StylePropertyShorthand& animatableProperties();
175 static bool isAllowedAnimation(CSSPropertyID); 174 static bool isAllowedAnimation(CSSPropertyID);
176 // FIXME: We should change the Element* to a const Element* 175 // FIXME: We should change the Element* to a const Element*
177 static PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> calculateUpdate(Element*, const Element& parentElement, const RenderStyle&, RenderStyle* parentStyle, Styl eResolver*); 176 static PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> calculateUpdate(Element*, const Element& parentElement, const RenderStyle&, RenderStyle* parentStyle, Styl eResolver*);
178 177
179 void setPendingUpdate(PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> update) { m _pendingUpdate = update; } 178 void setPendingUpdate(PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> update) { m _pendingUpdate = update; }
180 void maybeApplyPendingUpdate(Element*); 179 void maybeApplyPendingUpdate(Element*);
181 bool isEmpty() const { return m_animations.isEmpty() && m_transitions.isEmpt y() && !m_pendingUpdate; } 180 bool isEmpty() const { return m_animations.isEmpty() && m_transitions.isEmpt y() && !m_pendingUpdate; }
182 void cancel(); 181 void cancel();
183 182
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 const CSSPropertyID m_property; 251 const CSSPropertyID m_property;
253 AnimationNode::Phase m_previousPhase; 252 AnimationNode::Phase m_previousPhase;
254 }; 253 };
255 }; 254 };
256 255
257 } // namespace blink 256 } // namespace blink
258 257
259 WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::CSSAnimationUpdate::NewAnimation); 258 WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::CSSAnimationUpdate::NewAnimation);
260 259
261 #endif 260 #endif
OLDNEW
« no previous file with comments | « Source/core/animation/css/CSSAnimatableValueFactory.cpp ('k') | Source/core/animation/css/CSSAnimations.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698