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

Side by Side Diff: Source/core/animation/ElementAnimations.h

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ensureComputedStyle Created 5 years, 8 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 | « Source/core/animation/EffectInput.cpp ('k') | Source/core/animation/ElementAnimations.cpp » ('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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 CSSAnimations& cssAnimations() { return m_cssAnimations; } 60 CSSAnimations& cssAnimations() { return m_cssAnimations; }
61 const CSSAnimations& cssAnimations() const { return m_cssAnimations; } 61 const CSSAnimations& cssAnimations() const { return m_cssAnimations; }
62 62
63 // AnimationPlayers which have animations targeting this element. 63 // AnimationPlayers which have animations targeting this element.
64 AnimationPlayerCountedSet& players() { return m_players; } 64 AnimationPlayerCountedSet& players() { return m_players; }
65 65
66 bool isEmpty() const { return m_defaultStack.isEmpty() && m_cssAnimations.is Empty() && m_players.isEmpty(); } 66 bool isEmpty() const { return m_defaultStack.isEmpty() && m_cssAnimations.is Empty() && m_players.isEmpty(); }
67 67
68 void restartAnimationOnCompositor(); 68 void restartAnimationOnCompositor();
69 69
70 void updateAnimationFlags(LayoutStyle&); 70 void updateAnimationFlags(ComputedStyle&);
71 void setAnimationStyleChange(bool animationStyleChange) { m_animationStyleCh ange = animationStyleChange; } 71 void setAnimationStyleChange(bool animationStyleChange) { m_animationStyleCh ange = animationStyleChange; }
72 72
73 const LayoutStyle* baseLayoutStyle() const; 73 const ComputedStyle* baseComputedStyle() const;
74 void updateBaseLayoutStyle(const LayoutStyle*); 74 void updateBaseComputedStyle(const ComputedStyle*);
75 void clearBaseLayoutStyle(); 75 void clearBaseComputedStyle();
76 76
77 #if !ENABLE(OILPAN) 77 #if !ENABLE(OILPAN)
78 void addAnimation(Animation* animation) { m_animations.append(animation); } 78 void addAnimation(Animation* animation) { m_animations.append(animation); }
79 void notifyAnimationDestroyed(Animation* animation) { m_animations.remove(m_ animations.find(animation)); } 79 void notifyAnimationDestroyed(Animation* animation) { m_animations.remove(m_ animations.find(animation)); }
80 #endif 80 #endif
81 81
82 DECLARE_TRACE(); 82 DECLARE_TRACE();
83 83
84 private: 84 private:
85 bool isAnimationStyleChange() const; 85 bool isAnimationStyleChange() const;
86 86
87 AnimationStack m_defaultStack; 87 AnimationStack m_defaultStack;
88 CSSAnimations m_cssAnimations; 88 CSSAnimations m_cssAnimations;
89 AnimationPlayerCountedSet m_players; 89 AnimationPlayerCountedSet m_players;
90 bool m_animationStyleChange; 90 bool m_animationStyleChange;
91 RefPtr<LayoutStyle> m_baseLayoutStyle; 91 RefPtr<ComputedStyle> m_baseComputedStyle;
92 92
93 #if !ENABLE(OILPAN) 93 #if !ENABLE(OILPAN)
94 // FIXME: Oilpan: This is to avoid a reference cycle that keeps Elements ali ve 94 // FIXME: Oilpan: This is to avoid a reference cycle that keeps Elements ali ve
95 // and won't be needed once the Node hierarchy becomes traceable. 95 // and won't be needed once the Node hierarchy becomes traceable.
96 Vector<Animation*> m_animations; 96 Vector<Animation*> m_animations;
97 #endif 97 #endif
98 98
99 // CSSAnimations and DeferredLegacyStyleInterpolation checks if a style chan ge is due to animation. 99 // CSSAnimations and DeferredLegacyStyleInterpolation checks if a style chan ge is due to animation.
100 friend class CSSAnimations; 100 friend class CSSAnimations;
101 friend class DeferredLegacyStyleInterpolation; 101 friend class DeferredLegacyStyleInterpolation;
102 }; 102 };
103 103
104 } // namespace blink 104 } // namespace blink
105 105
106 #endif // ElementAnimations_h 106 #endif // ElementAnimations_h
OLDNEW
« no previous file with comments | « Source/core/animation/EffectInput.cpp ('k') | Source/core/animation/ElementAnimations.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698