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

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, 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/css/resolver/ScopedStyleResolver.h » ('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 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 } 195 }
196 ASSERT(startKeyframe->properties().size() == allProperties.size()); 196 ASSERT(startKeyframe->properties().size() == allProperties.size());
197 ASSERT(endKeyframe->properties().size() == allProperties.size()); 197 ASSERT(endKeyframe->properties().size() == allProperties.size());
198 } 198 }
199 199
200 } // namespace 200 } // namespace
201 201
202 const StyleRuleKeyframes* CSSAnimations::matchScopedKeyframesRule(StyleResolver* resolver, const Element* element, const StringImpl* animationName) 202 const StyleRuleKeyframes* CSSAnimations::matchScopedKeyframesRule(StyleResolver* resolver, const Element* element, const StringImpl* animationName)
203 { 203 {
204 // FIXME: This is all implementation detail of style resolver, CSSAnimations shouldn't be reaching into any of it. 204 // FIXME: This is all implementation detail of style resolver, CSSAnimations shouldn't be reaching into any of it.
205 if (resolver->document().styleEngine()->hasOnlyScopedResolverForDocument()) 205 if (element->document().styleEngine()->hasOnlyScopedResolverForDocument())
206 return element->document().scopedStyleResolver()->keyframeStylesForAnima tion(animationName); 206 return element->document().scopedStyleResolver()->keyframeStylesForAnima tion(animationName);
207 207
208 WillBeHeapVector<RawPtrWillBeMember<ScopedStyleResolver>, 8> stack; 208 WillBeHeapVector<RawPtrWillBeMember<ScopedStyleResolver>, 8> stack;
209 resolver->styleTreeResolveScopedKeyframesRules(element, stack); 209 resolver->styleTreeResolveScopedKeyframesRules(element, stack);
210 if (stack.isEmpty()) 210 if (stack.isEmpty())
211 return 0; 211 return 0;
212 212
213 for (size_t i = 0; i < stack.size(); ++i) { 213 for (size_t i = 0; i < stack.size(); ++i) {
214 if (const StyleRuleKeyframes* keyframesRule = stack.at(i)->keyframeStyle sForAnimation(animationName)) 214 if (const StyleRuleKeyframes* keyframesRule = stack.at(i)->keyframeStyle sForAnimation(animationName))
215 return keyframesRule; 215 return keyframesRule;
(...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after
730 #if ENABLE(OILPAN) 730 #if ENABLE(OILPAN)
731 visitor->trace(m_newTransitions); 731 visitor->trace(m_newTransitions);
732 visitor->trace(m_activeInterpolationsForAnimations); 732 visitor->trace(m_activeInterpolationsForAnimations);
733 visitor->trace(m_activeInterpolationsForTransitions); 733 visitor->trace(m_activeInterpolationsForTransitions);
734 visitor->trace(m_newAnimations); 734 visitor->trace(m_newAnimations);
735 visitor->trace(m_cancelledAnimationPlayers); 735 visitor->trace(m_cancelledAnimationPlayers);
736 #endif 736 #endif
737 } 737 }
738 738
739 } // namespace blink 739 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/core/css/resolver/ScopedStyleResolver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698