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

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

Issue 415743005: Move ScopedStyleResolver and ScopedStyleTree to oilpan's heap (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 5 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
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 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 } 196 }
197 197
198 } // namespace 198 } // namespace
199 199
200 const StyleRuleKeyframes* CSSAnimations::matchScopedKeyframesRule(StyleResolver* resolver, const Element* element, const StringImpl* animationName) 200 const StyleRuleKeyframes* CSSAnimations::matchScopedKeyframesRule(StyleResolver* resolver, const Element* element, const StringImpl* animationName)
201 { 201 {
202 // FIXME: This is all implementation detail of style resolver, CSSAnimations shouldn't be reaching into any of it. 202 // FIXME: This is all implementation detail of style resolver, CSSAnimations shouldn't be reaching into any of it.
203 if (resolver->styleTreeHasOnlyScopedResolverForDocument()) 203 if (resolver->styleTreeHasOnlyScopedResolverForDocument())
204 return element->document().scopedStyleResolver()->keyframeStylesForAnima tion(animationName); 204 return element->document().scopedStyleResolver()->keyframeStylesForAnima tion(animationName);
205 205
206 Vector<ScopedStyleResolver*, 8> stack; 206 WillBeHeapVector<RawPtrWillBeMember<ScopedStyleResolver>, 8> stack;
207 resolver->styleTreeResolveScopedKeyframesRules(element, stack); 207 resolver->styleTreeResolveScopedKeyframesRules(element, stack);
208 if (stack.isEmpty()) 208 if (stack.isEmpty())
209 return 0; 209 return 0;
210 210
211 for (size_t i = 0; i < stack.size(); ++i) { 211 for (size_t i = 0; i < stack.size(); ++i) {
212 if (const StyleRuleKeyframes* keyframesRule = stack.at(i)->keyframeStyle sForAnimation(animationName)) 212 if (const StyleRuleKeyframes* keyframesRule = stack.at(i)->keyframeStyle sForAnimation(animationName))
213 return keyframesRule; 213 return keyframesRule;
214 } 214 }
215 return 0; 215 return 0;
216 } 216 }
(...skipping 614 matching lines...) Expand 10 before | Expand all | Expand 10 after
831 #if ENABLE(OILPAN) 831 #if ENABLE(OILPAN)
832 visitor->trace(m_newTransitions); 832 visitor->trace(m_newTransitions);
833 visitor->trace(m_activeInterpolationsForAnimations); 833 visitor->trace(m_activeInterpolationsForAnimations);
834 visitor->trace(m_activeInterpolationsForTransitions); 834 visitor->trace(m_activeInterpolationsForTransitions);
835 visitor->trace(m_newAnimations); 835 visitor->trace(m_newAnimations);
836 visitor->trace(m_cancelledAnimationPlayers); 836 visitor->trace(m_cancelledAnimationPlayers);
837 #endif 837 #endif
838 } 838 }
839 839
840 } // namespace blink 840 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/core/css/resolver/ScopedStyleResolver.h » ('j') | Source/core/css/resolver/ScopedStyleResolver.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698