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

Side by Side Diff: Source/core/page/animation/CompositeAnimation.h

Issue 18228003: Remove AtomicStringImpl. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 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) 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2007 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 CompositeAnimation(AnimationControllerPrivate* animationController) 82 CompositeAnimation(AnimationControllerPrivate* animationController)
83 : m_animationController(animationController) 83 : m_animationController(animationController)
84 , m_suspended(false) 84 , m_suspended(false)
85 { 85 {
86 } 86 }
87 87
88 void updateTransitions(RenderObject*, RenderStyle* currentStyle, RenderStyle * targetStyle); 88 void updateTransitions(RenderObject*, RenderStyle* currentStyle, RenderStyle * targetStyle);
89 void updateKeyframeAnimations(RenderObject*, RenderStyle* currentStyle, Rend erStyle* targetStyle); 89 void updateKeyframeAnimations(RenderObject*, RenderStyle* currentStyle, Rend erStyle* targetStyle);
90 90
91 typedef HashMap<int, RefPtr<ImplicitAnimation> > CSSPropertyTransitionsMap; 91 typedef HashMap<int, RefPtr<ImplicitAnimation> > CSSPropertyTransitionsMap;
92 typedef HashMap<AtomicStringImpl*, RefPtr<KeyframeAnimation> > AnimationNam eMap; 92 typedef HashMap<StringImpl*, RefPtr<KeyframeAnimation> > AnimationNameMap;
93 93
94 AnimationControllerPrivate* m_animationController; 94 AnimationControllerPrivate* m_animationController;
95 CSSPropertyTransitionsMap m_transitions; 95 CSSPropertyTransitionsMap m_transitions;
96 AnimationNameMap m_keyframeAnimations; 96 AnimationNameMap m_keyframeAnimations;
97 Vector<AtomicStringImpl*> m_keyframeAnimationOrderMap; 97 Vector<StringImpl*> m_keyframeAnimationOrderMap;
98 bool m_suspended; 98 bool m_suspended;
99 }; 99 };
100 100
101 } // namespace WebCore 101 } // namespace WebCore
102 102
103 #endif // CompositeAnimation_h 103 #endif // CompositeAnimation_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698