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

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

Issue 2361733004: Adding @keyframes rules only affects TreeScope plus host. (Closed)
Patch Set: Moved scope check to CSSAnimations Created 4 years, 2 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 WTF_MAKE_NONCOPYABLE(CSSAnimations); 54 WTF_MAKE_NONCOPYABLE(CSSAnimations);
55 DISALLOW_NEW(); 55 DISALLOW_NEW();
56 public: 56 public:
57 CSSAnimations(); 57 CSSAnimations();
58 58
59 bool isAnimationForInspector(const Animation&); 59 bool isAnimationForInspector(const Animation&);
60 bool isTransitionAnimationForInspector(const Animation&) const; 60 bool isTransitionAnimationForInspector(const Animation&) const;
61 61
62 static const StylePropertyShorthand& propertiesForTransitionAll(); 62 static const StylePropertyShorthand& propertiesForTransitionAll();
63 static bool isAnimatableProperty(CSSPropertyID); 63 static bool isAnimatableProperty(CSSPropertyID);
64 static bool isAffectedByKeyframesFromScope(const Element&, const TreeScope&) ;
64 static void calculateUpdate(const Element* animatingElement, Element&, const ComputedStyle&, ComputedStyle* parentStyle, CSSAnimationUpdate&, StyleResolver* ); 65 static void calculateUpdate(const Element* animatingElement, Element&, const ComputedStyle&, ComputedStyle* parentStyle, CSSAnimationUpdate&, StyleResolver* );
65 static void snapshotCompositorKeyframes(Element&, CSSAnimationUpdate&, const ComputedStyle&, const ComputedStyle* parentStyle); 66 static void snapshotCompositorKeyframes(Element&, CSSAnimationUpdate&, const ComputedStyle&, const ComputedStyle* parentStyle);
66 67
67 void setPendingUpdate(const CSSAnimationUpdate& update) 68 void setPendingUpdate(const CSSAnimationUpdate& update)
68 { 69 {
69 clearPendingUpdate(); 70 clearPendingUpdate();
70 m_pendingUpdate.copy(update); 71 m_pendingUpdate.copy(update);
71 } 72 }
72 void clearPendingUpdate() 73 void clearPendingUpdate()
73 { 74 {
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 192
192 Member<Element> m_transitionTarget; 193 Member<Element> m_transitionTarget;
193 const CSSPropertyID m_property; 194 const CSSPropertyID m_property;
194 AnimationEffectReadOnly::Phase m_previousPhase; 195 AnimationEffectReadOnly::Phase m_previousPhase;
195 }; 196 };
196 }; 197 };
197 198
198 } // namespace blink 199 } // namespace blink
199 200
200 #endif 201 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698