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

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

Issue 642773004: Clear baseRenderStyle on detach. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 1 month 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
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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 67
68 bool isEmpty() const { return m_defaultStack.isEmpty() && m_cssAnimations.is Empty() && m_players.isEmpty(); } 68 bool isEmpty() const { return m_defaultStack.isEmpty() && m_cssAnimations.is Empty() && m_players.isEmpty(); }
69 69
70 void cancelAnimationOnCompositor(); 70 void cancelAnimationOnCompositor();
71 71
72 void updateAnimationFlags(RenderStyle&); 72 void updateAnimationFlags(RenderStyle&);
73 void setAnimationStyleChange(bool animationStyleChange) { m_animationStyleCh ange = animationStyleChange; } 73 void setAnimationStyleChange(bool animationStyleChange) { m_animationStyleCh ange = animationStyleChange; }
74 74
75 const RenderStyle* baseRenderStyle() const; 75 const RenderStyle* baseRenderStyle() const;
76 void updateBaseRenderStyle(const RenderStyle*); 76 void updateBaseRenderStyle(const RenderStyle*);
77 void clearBaseRenderStyle();
77 78
78 #if !ENABLE(OILPAN) 79 #if !ENABLE(OILPAN)
79 void addAnimation(Animation* animation) { m_animations.append(animation); } 80 void addAnimation(Animation* animation) { m_animations.append(animation); }
80 void notifyAnimationDestroyed(Animation* animation) { m_animations.remove(m_ animations.find(animation)); } 81 void notifyAnimationDestroyed(Animation* animation) { m_animations.remove(m_ animations.find(animation)); }
81 #endif 82 #endif
82 83
83 void trace(Visitor*); 84 void trace(Visitor*);
84 85
85 private: 86 private:
86 bool isAnimationStyleChange() const { return m_animationStyleChange; } 87 bool isAnimationStyleChange() const { return m_animationStyleChange; }
(...skipping 10 matching lines...) Expand all
97 Vector<Animation*> m_animations; 98 Vector<Animation*> m_animations;
98 #endif 99 #endif
99 100
100 // CSSAnimations checks if a style change is due to animation. 101 // CSSAnimations checks if a style change is due to animation.
101 friend class CSSAnimations; 102 friend class CSSAnimations;
102 }; 103 };
103 104
104 } // namespace blink 105 } // namespace blink
105 106
106 #endif 107 #endif
OLDNEW
« no previous file with comments | « LayoutTests/animations/base-render-style-crash-expected.html ('k') | Source/core/animation/ActiveAnimations.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698