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

Unified 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, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/animation/EffectInput.cpp ('k') | Source/core/animation/ElementAnimations.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/ElementAnimations.h
diff --git a/Source/core/animation/ElementAnimations.h b/Source/core/animation/ElementAnimations.h
index f8e9aa7e7b1c1153ddce8fe2368bc8195773a107..3bba2a443fdb72d8cfd1860c72673860433e2d93 100644
--- a/Source/core/animation/ElementAnimations.h
+++ b/Source/core/animation/ElementAnimations.h
@@ -67,12 +67,12 @@ public:
void restartAnimationOnCompositor();
- void updateAnimationFlags(LayoutStyle&);
+ void updateAnimationFlags(ComputedStyle&);
void setAnimationStyleChange(bool animationStyleChange) { m_animationStyleChange = animationStyleChange; }
- const LayoutStyle* baseLayoutStyle() const;
- void updateBaseLayoutStyle(const LayoutStyle*);
- void clearBaseLayoutStyle();
+ const ComputedStyle* baseComputedStyle() const;
+ void updateBaseComputedStyle(const ComputedStyle*);
+ void clearBaseComputedStyle();
#if !ENABLE(OILPAN)
void addAnimation(Animation* animation) { m_animations.append(animation); }
@@ -88,7 +88,7 @@ private:
CSSAnimations m_cssAnimations;
AnimationPlayerCountedSet m_players;
bool m_animationStyleChange;
- RefPtr<LayoutStyle> m_baseLayoutStyle;
+ RefPtr<ComputedStyle> m_baseComputedStyle;
#if !ENABLE(OILPAN)
// FIXME: Oilpan: This is to avoid a reference cycle that keeps Elements alive
« 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