OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "core/animation/CSSVisibilityInterpolationType.h" | 5 #include "core/animation/CSSVisibilityInterpolationType.h" |
6 | 6 |
7 #include "core/css/CSSPrimitiveValueMappings.h" | 7 #include "core/css/CSSPrimitiveValueMappings.h" |
8 #include "core/css/resolver/StyleResolverState.h" | 8 #include "core/css/resolver/StyleResolverState.h" |
9 #include "wtf/PtrUtil.h" | 9 #include "wtf/PtrUtil.h" |
10 #include <memory> | 10 #include <memory> |
(...skipping 12 matching lines...) Expand all Loading... |
23 EVisibility visibility() const { | 23 EVisibility visibility() const { |
24 DCHECK(m_isSingle); | 24 DCHECK(m_isSingle); |
25 return m_start; | 25 return m_start; |
26 } | 26 } |
27 | 27 |
28 EVisibility visibility(double fraction) const { | 28 EVisibility visibility(double fraction) const { |
29 if (m_isSingle || fraction <= 0) | 29 if (m_isSingle || fraction <= 0) |
30 return m_start; | 30 return m_start; |
31 if (fraction >= 1) | 31 if (fraction >= 1) |
32 return m_end; | 32 return m_end; |
33 if (m_start == EVisibility::Visible || m_end == EVisibility::Visible) | 33 if (m_start == EVisibility::kVisible || m_end == EVisibility::kVisible) |
34 return EVisibility::Visible; | 34 return EVisibility::kVisible; |
35 return fraction < 0.5 ? m_start : m_end; | 35 return fraction < 0.5 ? m_start : m_end; |
36 } | 36 } |
37 | 37 |
38 DECLARE_NON_INTERPOLABLE_VALUE_TYPE(); | 38 DECLARE_NON_INTERPOLABLE_VALUE_TYPE(); |
39 | 39 |
40 private: | 40 private: |
41 CSSVisibilityNonInterpolableValue(EVisibility start, EVisibility end) | 41 CSSVisibilityNonInterpolableValue(EVisibility start, EVisibility end) |
42 : m_start(start), m_end(end), m_isSingle(m_start == m_end) {} | 42 : m_start(start), m_end(end), m_isSingle(m_start == m_end) {} |
43 | 43 |
44 const EVisibility m_start; | 44 const EVisibility m_start; |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
111 toCSSVisibilityNonInterpolableValue(*underlying.nonInterpolableValue) | 111 toCSSVisibilityNonInterpolableValue(*underlying.nonInterpolableValue) |
112 .visibility(underlyingFraction); | 112 .visibility(underlyingFraction); |
113 conversionCheckers.push_back( | 113 conversionCheckers.push_back( |
114 UnderlyingVisibilityChecker::create(underlyingVisibility)); | 114 UnderlyingVisibilityChecker::create(underlyingVisibility)); |
115 return createVisibilityValue(underlyingVisibility); | 115 return createVisibilityValue(underlyingVisibility); |
116 } | 116 } |
117 | 117 |
118 InterpolationValue CSSVisibilityInterpolationType::maybeConvertInitial( | 118 InterpolationValue CSSVisibilityInterpolationType::maybeConvertInitial( |
119 const StyleResolverState&, | 119 const StyleResolverState&, |
120 ConversionCheckers&) const { | 120 ConversionCheckers&) const { |
121 return createVisibilityValue(EVisibility::Visible); | 121 return createVisibilityValue(EVisibility::kVisible); |
122 } | 122 } |
123 | 123 |
124 InterpolationValue CSSVisibilityInterpolationType::maybeConvertInherit( | 124 InterpolationValue CSSVisibilityInterpolationType::maybeConvertInherit( |
125 const StyleResolverState& state, | 125 const StyleResolverState& state, |
126 ConversionCheckers& conversionCheckers) const { | 126 ConversionCheckers& conversionCheckers) const { |
127 if (!state.parentStyle()) | 127 if (!state.parentStyle()) |
128 return nullptr; | 128 return nullptr; |
129 EVisibility inheritedVisibility = state.parentStyle()->visibility(); | 129 EVisibility inheritedVisibility = state.parentStyle()->visibility(); |
130 conversionCheckers.push_back( | 130 conversionCheckers.push_back( |
131 InheritedVisibilityChecker::create(inheritedVisibility)); | 131 InheritedVisibilityChecker::create(inheritedVisibility)); |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
185 // Visibility interpolation has been deferred to application time here due to | 185 // Visibility interpolation has been deferred to application time here due to |
186 // its non-linear behaviour. | 186 // its non-linear behaviour. |
187 double fraction = toInterpolableNumber(interpolableValue).value(); | 187 double fraction = toInterpolableNumber(interpolableValue).value(); |
188 EVisibility visibility = | 188 EVisibility visibility = |
189 toCSSVisibilityNonInterpolableValue(nonInterpolableValue) | 189 toCSSVisibilityNonInterpolableValue(nonInterpolableValue) |
190 ->visibility(fraction); | 190 ->visibility(fraction); |
191 state.style()->setVisibility(visibility); | 191 state.style()->setVisibility(visibility); |
192 } | 192 } |
193 | 193 |
194 } // namespace blink | 194 } // namespace blink |
OLD | NEW |