| OLD | NEW |
| 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 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 197 | 197 |
| 198 const AtomicString getAnimationNameForInspector(const AnimationPlayer&); | 198 const AtomicString getAnimationNameForInspector(const AnimationPlayer&); |
| 199 | 199 |
| 200 // FIXME: This method is only used here and in the legacy animations | 200 // FIXME: This method is only used here and in the legacy animations |
| 201 // implementation. It should be made private or file-scope when the legacy | 201 // implementation. It should be made private or file-scope when the legacy |
| 202 // engine is removed. | 202 // engine is removed. |
| 203 static const StyleRuleKeyframes* matchScopedKeyframesRule(StyleResolver*, co
nst Element*, const StringImpl*); | 203 static const StyleRuleKeyframes* matchScopedKeyframesRule(StyleResolver*, co
nst Element*, const StringImpl*); |
| 204 | 204 |
| 205 static const StylePropertyShorthand& animatableProperties(); | 205 static const StylePropertyShorthand& animatableProperties(); |
| 206 static bool isAllowedAnimation(CSSPropertyID); | 206 static bool isAllowedAnimation(CSSPropertyID); |
| 207 // FIXME: We should change the Element* to a const Element* | |
| 208 static PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> calculateUpdate(const Elem
ent* animatingElement, Element&, const RenderStyle&, RenderStyle* parentStyle, S
tyleResolver*); | 207 static PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> calculateUpdate(const Elem
ent* animatingElement, Element&, const RenderStyle&, RenderStyle* parentStyle, S
tyleResolver*); |
| 209 | 208 |
| 210 void setPendingUpdate(PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> update) { m
_pendingUpdate = update; } | 209 void setPendingUpdate(PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> update) { m
_pendingUpdate = update; } |
| 211 void maybeApplyPendingUpdate(Element*); | 210 void maybeApplyPendingUpdate(Element*); |
| 212 bool isEmpty() const { return m_animations.isEmpty() && m_transitions.isEmpt
y() && !m_pendingUpdate; } | 211 bool isEmpty() const { return m_animations.isEmpty() && m_transitions.isEmpt
y() && !m_pendingUpdate; } |
| 213 void cancel(); | 212 void cancel(); |
| 214 | 213 |
| 215 void trace(Visitor*); | 214 void trace(Visitor*); |
| 216 | 215 |
| 217 private: | 216 private: |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 286 AnimationNode::Phase m_previousPhase; | 285 AnimationNode::Phase m_previousPhase; |
| 287 }; | 286 }; |
| 288 }; | 287 }; |
| 289 | 288 |
| 290 } // namespace blink | 289 } // namespace blink |
| 291 | 290 |
| 292 WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::CSSAnimationUpdate::NewAnimation); | 291 WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::CSSAnimationUpdate::NewAnimation); |
| 293 WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::CSSAnimationUpdate::UpdatedAnimationTim
ing); | 292 WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::CSSAnimationUpdate::UpdatedAnimationTim
ing); |
| 294 | 293 |
| 295 #endif | 294 #endif |
| OLD | NEW |