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

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

Issue 579253002: Change StyleResolver::document() to be private (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 3 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 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 } 193 }
194 } 194 }
195 ASSERT(startKeyframe->properties().size() == allProperties.size()); 195 ASSERT(startKeyframe->properties().size() == allProperties.size());
196 ASSERT(endKeyframe->properties().size() == allProperties.size()); 196 ASSERT(endKeyframe->properties().size() == allProperties.size());
197 } 197 }
198 198
199 } // namespace 199 } // namespace
200 200
201 const StyleRuleKeyframes* CSSAnimations::matchScopedKeyframesRule(StyleResolver* resolver, const Element* element, const StringImpl* animationName) 201 const StyleRuleKeyframes* CSSAnimations::matchScopedKeyframesRule(StyleResolver* resolver, const Element* element, const StringImpl* animationName)
202 { 202 {
203 // FIXME: This is all implementation detail of style resolver, CSSAnimations shouldn't be reaching into any of it. 203 // FIXME: This is all implementation detail of style resolver, CSSAnimations shouldn't be reaching into any of it.
rune 2014/09/24 08:16:20 Fixing this FIXME would make more sense.
Timothy Loh 2014/09/24 08:20:10 I think esprehn has a patch up for this somewhere.
esprehn 2014/09/24 08:39:33 Yeah we can do that in a separate patch.
204 if (resolver->document().styleEngine()->hasOnlyScopedResolverForDocument()) 204 if (element->document().styleEngine()->hasOnlyScopedResolverForDocument())
205 return element->document().scopedStyleResolver()->keyframeStylesForAnima tion(animationName); 205 return element->document().scopedStyleResolver()->keyframeStylesForAnima tion(animationName);
206 206
207 WillBeHeapVector<RawPtrWillBeMember<ScopedStyleResolver>, 8> stack; 207 WillBeHeapVector<RawPtrWillBeMember<ScopedStyleResolver>, 8> stack;
208 resolver->styleTreeResolveScopedKeyframesRules(element, stack); 208 resolver->styleTreeResolveScopedKeyframesRules(element, stack);
209 if (stack.isEmpty()) 209 if (stack.isEmpty())
210 return 0; 210 return 0;
211 211
212 for (size_t i = 0; i < stack.size(); ++i) { 212 for (size_t i = 0; i < stack.size(); ++i) {
213 if (const StyleRuleKeyframes* keyframesRule = stack.at(i)->keyframeStyle sForAnimation(animationName)) 213 if (const StyleRuleKeyframes* keyframesRule = stack.at(i)->keyframeStyle sForAnimation(animationName))
214 return keyframesRule; 214 return keyframesRule;
(...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after
729 #if ENABLE(OILPAN) 729 #if ENABLE(OILPAN)
730 visitor->trace(m_newTransitions); 730 visitor->trace(m_newTransitions);
731 visitor->trace(m_activeInterpolationsForAnimations); 731 visitor->trace(m_activeInterpolationsForAnimations);
732 visitor->trace(m_activeInterpolationsForTransitions); 732 visitor->trace(m_activeInterpolationsForTransitions);
733 visitor->trace(m_newAnimations); 733 visitor->trace(m_newAnimations);
734 visitor->trace(m_cancelledAnimationPlayers); 734 visitor->trace(m_cancelledAnimationPlayers);
735 #endif 735 #endif
736 } 736 }
737 737
738 } // namespace blink 738 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/core/css/resolver/ScopedStyleResolver.cpp » ('j') | Source/core/css/resolver/ScopedStyleResolver.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698