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

Unified Diff: third_party/WebKit/Source/core/animation/CSSPathInterpolationType.h

Issue 1592593002: Web Animations: Animate d presentation attribute using InterpolableValue (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove assert Created 4 years, 11 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: third_party/WebKit/Source/core/animation/CSSPathInterpolationType.h
diff --git a/third_party/WebKit/Source/core/animation/CSSImageListInterpolationType.h b/third_party/WebKit/Source/core/animation/CSSPathInterpolationType.h
similarity index 71%
copy from third_party/WebKit/Source/core/animation/CSSImageListInterpolationType.h
copy to third_party/WebKit/Source/core/animation/CSSPathInterpolationType.h
index 78a779909086bd6f69d173e1820bd893ef896346..e9f2324404eeecbdff6dd19c211f2ea90437f11b 100644
--- a/third_party/WebKit/Source/core/animation/CSSImageListInterpolationType.h
+++ b/third_party/WebKit/Source/core/animation/CSSPathInterpolationType.h
@@ -1,36 +1,32 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
+// Copyright 2016 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CSSImageListInterpolationType_h
-#define CSSImageListInterpolationType_h
+#ifndef CSSPathInterpolationType_h
+#define CSSPathInterpolationType_h
#include "core/animation/CSSInterpolationType.h"
-#include "core/animation/ImageListPropertyFunctions.h"
namespace blink {
-class CSSImageListInterpolationType : public CSSInterpolationType {
+class CSSPathInterpolationType : public CSSInterpolationType {
public:
- CSSImageListInterpolationType(CSSPropertyID property)
+ CSSPathInterpolationType(CSSPropertyID property)
: CSSInterpolationType(property)
{ }
- PassOwnPtr<InterpolationValue> maybeConvertUnderlyingValue(const InterpolationEnvironment&) const final;
- void composite(UnderlyingValue&, double underlyingFraction, const InterpolationValue&) const final;
void apply(const InterpolableValue&, const NonInterpolableValue*, InterpolationEnvironment&) const final;
+ void composite(UnderlyingValue&, double underlyingFraction, const InterpolationValue&) const final;
-private:
- PassOwnPtr<InterpolationValue> maybeConvertStyleImageList(const StyleImageList&) const;
-
+protected:
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<InterpolationValue> maybeConvertUnderlyingValue(const InterpolationEnvironment&) const final;
PassOwnPtr<PairwisePrimitiveInterpolation> mergeSingleConversions(InterpolationValue& startValue, InterpolationValue& endValue) const final;
};
} // namespace blink
-#endif // CSSImageListInterpolationType_h
+#endif // CSSPathInterpolationType_h

Powered by Google App Engine
This is Rietveld 408576698