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

Unified Diff: sky/engine/core/rendering/style/StyleRareNonInheritedData.cpp

Issue 1229273004: Remove Animations and Transitions. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 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 side-by-side diff with in-line comments
Download patch
Index: sky/engine/core/rendering/style/StyleRareNonInheritedData.cpp
diff --git a/sky/engine/core/rendering/style/StyleRareNonInheritedData.cpp b/sky/engine/core/rendering/style/StyleRareNonInheritedData.cpp
index 7fc7c8d6930d07e354a1ce7b65e44feec3c246e8..d4ed234c3fa9166ef79155e0c35e05c858fc4bb4 100644
--- a/sky/engine/core/rendering/style/StyleRareNonInheritedData.cpp
+++ b/sky/engine/core/rendering/style/StyleRareNonInheritedData.cpp
@@ -72,12 +72,9 @@ StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited
, m_perspectiveOriginY(o.m_perspectiveOriginY)
, m_flexibleBox(o.m_flexibleBox)
, m_transform(o.m_transform)
- , m_willChange(o.m_willChange)
, m_filter(o.m_filter)
, m_counterDirectives(o.m_counterDirectives ? clone(*o.m_counterDirectives) : nullptr)
, m_boxShadow(o.m_boxShadow)
- , m_animations(o.m_animations ? CSSAnimationData::create(*o.m_animations) : nullptr)
- , m_transitions(o.m_transitions ? CSSTransitionData::create(*o.m_transitions) : nullptr)
, m_clipPath(o.m_clipPath)
, m_textDecorationColor(o.m_textDecorationColor)
, m_order(o.m_order)
@@ -118,12 +115,9 @@ bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) c
&& m_perspectiveOriginY == o.m_perspectiveOriginY
&& m_flexibleBox == o.m_flexibleBox
&& m_transform == o.m_transform
- && m_willChange == o.m_willChange
&& m_filter == o.m_filter
&& counterDataEquivalent(o)
&& shadowDataEquivalent(o)
- && animationDataEquivalent(o)
- && transitionDataEquivalent(o)
&& m_clipPath == o.m_clipPath
&& m_textDecorationColor == o.m_textDecorationColor
&& m_order == o.m_order
@@ -159,24 +153,6 @@ bool StyleRareNonInheritedData::shadowDataEquivalent(const StyleRareNonInherited
return dataEquivalent(m_boxShadow, o.m_boxShadow);
}
-bool StyleRareNonInheritedData::animationDataEquivalent(const StyleRareNonInheritedData& o) const
-{
- if (!m_animations && !o.m_animations)
- return true;
- if (!m_animations || !o.m_animations)
- return false;
- return m_animations->animationsMatchForStyleRecalc(*o.m_animations);
-}
-
-bool StyleRareNonInheritedData::transitionDataEquivalent(const StyleRareNonInheritedData& o) const
-{
- if (!m_transitions && !o.m_transitions)
- return true;
- if (!m_transitions || !o.m_transitions)
- return false;
- return m_transitions->transitionsMatchForStyleRecalc(*o.m_transitions);
-}
-
bool StyleRareNonInheritedData::hasFilters() const
{
return m_filter.get() && !m_filter->m_operations.isEmpty();
« no previous file with comments | « sky/engine/core/rendering/style/StyleRareNonInheritedData.h ('k') | sky/engine/core/rendering/style/StyleWillChangeData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698