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

Side by Side Diff: Source/core/css/resolver/StyleResolver.h

Issue 23875044: Web Animations: Correctly handle incomplete keyframes in CSS animations (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Handle end keyframes first Created 7 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/animation/css/CSSAnimations.cpp ('k') | Source/core/css/resolver/StyleResolver.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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 void pushParentShadowRoot(const ShadowRoot&); 188 void pushParentShadowRoot(const ShadowRoot&);
189 void popParentShadowRoot(const ShadowRoot&); 189 void popParentShadowRoot(const ShadowRoot&);
190 190
191 PassRefPtr<RenderStyle> styleForElement(Element*, RenderStyle* parentStyle = 0, StyleSharingBehavior = AllowStyleSharing, 191 PassRefPtr<RenderStyle> styleForElement(Element*, RenderStyle* parentStyle = 0, StyleSharingBehavior = AllowStyleSharing,
192 RuleMatchingBehavior = MatchAllRules, RenderRegion* regionForStyling = 0 ); 192 RuleMatchingBehavior = MatchAllRules, RenderRegion* regionForStyling = 0 );
193 193
194 // FIXME: The following logic related to animations and keyframes should be factored out of StyleResolver 194 // FIXME: The following logic related to animations and keyframes should be factored out of StyleResolver
195 // The body of calculateCSSAnimationUpdate can move to CSSAnimations.cpp and take just const element, const style, 195 // The body of calculateCSSAnimationUpdate can move to CSSAnimations.cpp and take just const element, const style,
196 // and const ScopedStyleTree 196 // and const ScopedStyleTree
197 void calculateCSSAnimationUpdate(StyleResolverState&); 197 void calculateCSSAnimationUpdate(StyleResolverState&);
198 void resolveKeyframes(const Element*, const RenderStyle*, const AtomicString & animationName, TimingFunction* defaultTimingFunction, KeyframeAnimationEffect: :KeyframeVector&, RefPtr<TimingFunction>&); 198 void resolveKeyframes(const Element*, const RenderStyle*, const AtomicString & animationName, TimingFunction* defaultTimingFunction, Vector<std::pair<Keyfram eAnimationEffect::KeyframeVector, RefPtr<TimingFunction> > >&);
199 void keyframeStylesForAnimation(Element*, const RenderStyle*, KeyframeList&) ; 199 void keyframeStylesForAnimation(Element*, const RenderStyle*, KeyframeList&) ;
200 const StyleRuleKeyframes* matchScopedKeyframesRule(const Element*, const Str ingImpl* animationName); 200 const StyleRuleKeyframes* matchScopedKeyframesRule(const Element*, const Str ingImpl* animationName);
201 PassRefPtr<RenderStyle> styleForKeyframe(Element*, const RenderStyle*, const StyleKeyframe*); 201 PassRefPtr<RenderStyle> styleForKeyframe(Element*, const RenderStyle*, const StyleKeyframe*);
202 202
203 PassRefPtr<RenderStyle> pseudoStyleForElement(Element*, const PseudoStyleReq uest&, RenderStyle* parentStyle); 203 PassRefPtr<RenderStyle> pseudoStyleForElement(Element*, const PseudoStyleReq uest&, RenderStyle* parentStyle);
204 204
205 PassRefPtr<RenderStyle> styleForPage(int pageIndex); 205 PassRefPtr<RenderStyle> styleForPage(int pageIndex);
206 PassRefPtr<RenderStyle> defaultStyleForElement(); 206 PassRefPtr<RenderStyle> defaultStyleForElement();
207 PassRefPtr<RenderStyle> styleForText(Text*); 207 PassRefPtr<RenderStyle> styleForText(Text*);
208 208
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
385 PseudoId ignoreDynamicPseudo = NOPSEUDO; 385 PseudoId ignoreDynamicPseudo = NOPSEUDO;
386 if (selectorChecker.match(selectorCheckingContext, ignoreDynamicPseudo, DOMSiblingTraversalStrategy()) == SelectorChecker::SelectorMatches) 386 if (selectorChecker.match(selectorCheckingContext, ignoreDynamicPseudo, DOMSiblingTraversalStrategy()) == SelectorChecker::SelectorMatches)
387 return true; 387 return true;
388 } 388 }
389 return false; 389 return false;
390 } 390 }
391 391
392 } // namespace WebCore 392 } // namespace WebCore
393 393
394 #endif // StyleResolver_h 394 #endif // StyleResolver_h
OLDNEW
« no previous file with comments | « Source/core/animation/css/CSSAnimations.cpp ('k') | Source/core/css/resolver/StyleResolver.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698