trunk/Source/core/page/animation/CompositeAnimation.h - Issue 18196004: Revert 153294 "Remove AtomicStringImpl."

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 18196004: Revert 153294 "Remove AtomicStringImpl." (Closed) Base URL: svn://svn.chromium.org/blink/

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

« no previous file with comments | « trunk/Source/core/html/HTMLObjectElement.cpp ('k') | trunk/Source/core/page/animation/CompositeAnimation.cpp » ('j') | no next file with comments »

OLD	NEW
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 69 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
80 CompositeAnimation(AnimationControllerPrivate* animationController)	80 CompositeAnimation(AnimationControllerPrivate* animationController)

81 : m_animationController(animationController)	81 : m_animationController(animationController)

82 , m_suspended(false)	82 , m_suspended(false)

83 {	83 {

84 }	84 }

85	85

86 void updateTransitions(RenderObject, RenderStyle currentStyle, RenderStyle * targetStyle);	86 void updateTransitions(RenderObject, RenderStyle currentStyle, RenderStyle * targetStyle);

87 void updateKeyframeAnimations(RenderObject, RenderStyle currentStyle, Rend erStyle* targetStyle);	87 void updateKeyframeAnimations(RenderObject, RenderStyle currentStyle, Rend erStyle* targetStyle);

88	88

89 typedef HashMap<int, RefPtr<ImplicitAnimation> > CSSPropertyTransitionsMap;	89 typedef HashMap<int, RefPtr<ImplicitAnimation> > CSSPropertyTransitionsMap;

90 typedef HashMap<StringImpl*, RefPtr<KeyframeAnimation> > AnimationNameMap;	90 typedef HashMap<AtomicStringImpl*, RefPtr<KeyframeAnimation> > AnimationNam eMap;

91	91

92 AnimationControllerPrivate* m_animationController;	92 AnimationControllerPrivate* m_animationController;

93 CSSPropertyTransitionsMap m_transitions;	93 CSSPropertyTransitionsMap m_transitions;

94 AnimationNameMap m_keyframeAnimations;	94 AnimationNameMap m_keyframeAnimations;

95 Vector<StringImpl*> m_keyframeAnimationOrderMap;	95 Vector<AtomicStringImpl*> m_keyframeAnimationOrderMap;

96 bool m_suspended;	96 bool m_suspended;

97 };	97 };

98	98

99 } // namespace WebCore	99 } // namespace WebCore

100	100

101 #endif // CompositeAnimation_h	101 #endif // CompositeAnimation_h

OLD	NEW