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

Unified Diff: Source/core/rendering/style/RenderStyle.h

Issue 14409013: Rename CSSAnimationData* -> StyleAnimationData* (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/RenderLayerBacking.cpp ('k') | Source/core/rendering/style/RenderStyle.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/style/RenderStyle.h
diff --git a/Source/core/rendering/style/RenderStyle.h b/Source/core/rendering/style/RenderStyle.h
index 3563a1848b3778e7ecf5b8063621ef5f2d64caae..51c8ae079b3960e56cc82476d4118ece083dc861 100644
--- a/Source/core/rendering/style/RenderStyle.h
+++ b/Source/core/rendering/style/RenderStyle.h
@@ -33,7 +33,7 @@
#include "core/platform/LengthBox.h"
#include "core/platform/LengthSize.h"
#include "core/platform/ThemeTypes.h"
-#include "core/platform/animation/CSSAnimationDataList.h"
+#include "core/platform/animation/StyleAnimationDataList.h"
#include "core/platform/graphics/Color.h"
#include "core/platform/graphics/ColorSpace.h"
#include "core/platform/graphics/FontBaseline.h"
@@ -877,17 +877,17 @@ public:
// Apple-specific property getter methods
EPointerEvents pointerEvents() const { return static_cast<EPointerEvents>(inherited_flags._pointerEvents); }
- const CSSAnimationDataList* animations() const { return rareNonInheritedData->m_animations.get(); }
- const CSSAnimationDataList* transitions() const { return rareNonInheritedData->m_transitions.get(); }
+ const StyleAnimationDataList* animations() const { return rareNonInheritedData->m_animations.get(); }
+ const StyleAnimationDataList* transitions() const { return rareNonInheritedData->m_transitions.get(); }
- CSSAnimationDataList* accessAnimations();
- CSSAnimationDataList* accessTransitions();
+ StyleAnimationDataList* accessAnimations();
+ StyleAnimationDataList* accessTransitions();
bool hasAnimations() const { return rareNonInheritedData->m_animations && rareNonInheritedData->m_animations->size() > 0; }
bool hasTransitions() const { return rareNonInheritedData->m_transitions && rareNonInheritedData->m_transitions->size() > 0; }
// return the first found Animation (including 'all' transitions)
- const CSSAnimationData* transitionForProperty(CSSPropertyID) const;
+ const StyleAnimationData* transitionForProperty(CSSPropertyID) const;
ETransformStyle3D transformStyle3D() const { return static_cast<ETransformStyle3D>(rareNonInheritedData->m_transformStyle3D); }
bool preserves3D() const { return rareNonInheritedData->m_transformStyle3D == TransformStyle3DPreserve3D; }
@@ -1323,8 +1323,8 @@ public:
rareNonInheritedData.access()->m_transitions.clear();
}
- void inheritAnimations(const CSSAnimationDataList* parent) { rareNonInheritedData.access()->m_animations = parent ? adoptPtr(new CSSAnimationDataList(*parent)) : nullptr; }
- void inheritTransitions(const CSSAnimationDataList* parent) { rareNonInheritedData.access()->m_transitions = parent ? adoptPtr(new CSSAnimationDataList(*parent)) : nullptr; }
+ void inheritAnimations(const StyleAnimationDataList* parent) { rareNonInheritedData.access()->m_animations = parent ? adoptPtr(new StyleAnimationDataList(*parent)) : nullptr; }
+ void inheritTransitions(const StyleAnimationDataList* parent) { rareNonInheritedData.access()->m_transitions = parent ? adoptPtr(new StyleAnimationDataList(*parent)) : nullptr; }
void adjustAnimations();
void adjustTransitions();
« no previous file with comments | « Source/core/rendering/RenderLayerBacking.cpp ('k') | Source/core/rendering/style/RenderStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698