Chromium Code Reviews| Index: third_party/WebKit/Source/core/animation/CSSVisibilityInterpolationType.cpp |
| diff --git a/third_party/WebKit/Source/core/animation/CSSVisibilityInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSVisibilityInterpolationType.cpp |
| index 40fc30eaef371bf4f2709de35de96982cdb34368..52f5c0863734943315b6e0d5e6d11b75e2e0443a 100644 |
| --- a/third_party/WebKit/Source/core/animation/CSSVisibilityInterpolationType.cpp |
| +++ b/third_party/WebKit/Source/core/animation/CSSVisibilityInterpolationType.cpp |
| @@ -32,8 +32,8 @@ public: |
| return m_start; |
| if (fraction >= 1) |
| return m_end; |
| - if (m_start == VISIBLE || m_end == VISIBLE) |
| - return VISIBLE; |
| + if (m_start == EVisibility::Visible || m_end == EVisibility::Visible) |
| + return EVisibility::Visible; |
| return fraction < 0.5 ? m_start : m_end; |
| } |
| @@ -87,14 +87,15 @@ public: |
| private: |
| ParentVisibilityChecker(EVisibility visibility) |
| - : m_visibility(visibility) |
| + : m_visibility(static_cast<double>(visibility)) |
| { } |
| bool isValid(const InterpolationEnvironment& environment, const InterpolationValue& underlying) const final |
| { |
| - return m_visibility == environment.state().parentStyle()->visibility(); |
| + return static_cast<EVisibility>(m_visibility) == environment.state().parentStyle()->visibility(); |
| } |
| + // TODO(sashab): Why is this being stored as a double? |
|
Bugs Nash
2016/07/28 01:25:12
Should a question be put in as a TODO? Maybe do th
sashab
2016/07/29 06:25:50
Seems to be added by alancutter@ here:
https://cod
alancutter (OOO until 2018)
2016/07/29 09:16:47
This is indeed a mistake, feel free to make it sto
|
| const double m_visibility; |
| }; |
| @@ -113,7 +114,7 @@ InterpolationValue CSSVisibilityInterpolationType::maybeConvertNeutral(const Int |
| InterpolationValue CSSVisibilityInterpolationType::maybeConvertInitial(const StyleResolverState&, ConversionCheckers&) const |
| { |
| - return createVisibilityValue(VISIBLE); |
| + return createVisibilityValue(EVisibility::Visible); |
| } |
| InterpolationValue CSSVisibilityInterpolationType::maybeConvertInherit(const StyleResolverState& state, ConversionCheckers& conversionCheckers) const |