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

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

Issue 664993002: Devtools Animations: Display keyframes for CSS Animations in inspector (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Review changes Created 6 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
« no previous file with comments | « no previous file | Source/core/animation/css/CSSAnimations.cpp » ('j') | 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) 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 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> > m_activ eInterpolationsForAnimations; 160 WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> > m_activ eInterpolationsForAnimations;
161 WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> > m_activ eInterpolationsForTransitions; 161 WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> > m_activ eInterpolationsForTransitions;
162 }; 162 };
163 163
164 class CSSAnimations final { 164 class CSSAnimations final {
165 WTF_MAKE_NONCOPYABLE(CSSAnimations); 165 WTF_MAKE_NONCOPYABLE(CSSAnimations);
166 DISALLOW_ALLOCATION(); 166 DISALLOW_ALLOCATION();
167 public: 167 public:
168 CSSAnimations(); 168 CSSAnimations();
169 169
170 const AtomicString getAnimationNameForInspector(const AnimationPlayer&);
171
170 // FIXME: This method is only used here and in the legacy animations 172 // FIXME: This method is only used here and in the legacy animations
171 // implementation. It should be made private or file-scope when the legacy 173 // implementation. It should be made private or file-scope when the legacy
172 // engine is removed. 174 // engine is removed.
173 static const StyleRuleKeyframes* matchScopedKeyframesRule(StyleResolver*, co nst Element*, const StringImpl*); 175 static const StyleRuleKeyframes* matchScopedKeyframesRule(StyleResolver*, co nst Element*, const StringImpl*);
174 176
175 static const StylePropertyShorthand& animatableProperties(); 177 static const StylePropertyShorthand& animatableProperties();
176 static bool isAllowedAnimation(CSSPropertyID); 178 static bool isAllowedAnimation(CSSPropertyID);
177 // FIXME: We should change the Element* to a const Element* 179 // FIXME: We should change the Element* to a const Element*
178 static PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> calculateUpdate(const Elem ent* animatingElement, Element&, const RenderStyle&, RenderStyle* parentStyle, S tyleResolver*); 180 static PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> calculateUpdate(const Elem ent* animatingElement, Element&, const RenderStyle&, RenderStyle* parentStyle, S tyleResolver*);
179 181
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 const CSSPropertyID m_property; 255 const CSSPropertyID m_property;
254 AnimationNode::Phase m_previousPhase; 256 AnimationNode::Phase m_previousPhase;
255 }; 257 };
256 }; 258 };
257 259
258 } // namespace blink 260 } // namespace blink
259 261
260 WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::CSSAnimationUpdate::NewAnimation); 262 WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::CSSAnimationUpdate::NewAnimation);
261 263
262 #endif 264 #endif
OLDNEW
« no previous file with comments | « no previous file | Source/core/animation/css/CSSAnimations.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698