Index: third_party/WebKit/Source/core/animation/CSSVisibilityInterpolationType.h |
diff --git a/third_party/WebKit/Source/core/animation/CSSShadowListInterpolationType.h b/third_party/WebKit/Source/core/animation/CSSVisibilityInterpolationType.h |
similarity index 73% |
copy from third_party/WebKit/Source/core/animation/CSSShadowListInterpolationType.h |
copy to third_party/WebKit/Source/core/animation/CSSVisibilityInterpolationType.h |
index 4aa8e251858bb8b39f2f77e9682ad25afc56d9a9..6b0e05512e523a9ab1ae21341bc255dd0cabba2c 100644 |
--- a/third_party/WebKit/Source/core/animation/CSSShadowListInterpolationType.h |
+++ b/third_party/WebKit/Source/core/animation/CSSVisibilityInterpolationType.h |
@@ -2,36 +2,36 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef CSSShadowListInterpolationType_h |
-#define CSSShadowListInterpolationType_h |
+#ifndef CSSVisibilityInterpolationType_h |
+#define CSSVisibilityInterpolationType_h |
#include "core/animation/CSSInterpolationType.h" |
+#include "core/style/ComputedStyleConstants.h" |
namespace blink { |
-class ShadowList; |
- |
-class CSSShadowListInterpolationType : public CSSInterpolationType { |
+class CSSVisibilityInterpolationType : public CSSInterpolationType { |
public: |
- CSSShadowListInterpolationType(CSSPropertyID property) |
+ CSSVisibilityInterpolationType(CSSPropertyID property) |
: CSSInterpolationType(property) |
- { } |
+ { |
+ ASSERT(property == CSSPropertyVisibility); |
+ } |
PassOwnPtr<InterpolationValue> maybeConvertUnderlyingValue(const InterpolationEnvironment&) const final; |
+ PassOwnPtr<PairwisePrimitiveInterpolation> mergeSingleConversions(InterpolationValue& startValue, InterpolationValue& endValue) const final; |
void composite(UnderlyingValue&, double underlyingFraction, const InterpolationValue&) const final; |
void apply(const InterpolableValue&, const NonInterpolableValue*, InterpolationEnvironment&) const final; |
private: |
- PassOwnPtr<InterpolationValue> convertShadowList(const ShadowList*, double zoom) const; |
- PassOwnPtr<InterpolationValue> createNeutralValue() const; |
- |
+ PassOwnPtr<InterpolationValue> createVisibilityValue(EVisibility) const; |
PassOwnPtr<InterpolationValue> maybeConvertNeutral(const UnderlyingValue&, ConversionCheckers&) const final; |
PassOwnPtr<InterpolationValue> maybeConvertInitial() const final; |
PassOwnPtr<InterpolationValue> maybeConvertInherit(const StyleResolverState&, ConversionCheckers&) const final; |
PassOwnPtr<InterpolationValue> maybeConvertValue(const CSSValue&, const StyleResolverState&, ConversionCheckers&) const final; |
- PassOwnPtr<PairwisePrimitiveInterpolation> mergeSingleConversions(InterpolationValue& startValue, InterpolationValue& endValue) const final; |
+ |
}; |
} // namespace blink |
-#endif // CSSShadowListInterpolationType_h |
+#endif // CSSVisibilityInterpolationType_h |