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

Unified Diff: third_party/WebKit/Source/core/animation/CSSBasicShapeInterpolationType.cpp

Issue 2812213002: Add CSSInterpolationType specific ConversionChecker (Closed)
Patch Set: rebased Created 3 years, 7 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/animation/CSSBorderImageLengthBoxInterpolationType.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/animation/CSSBasicShapeInterpolationType.cpp
diff --git a/third_party/WebKit/Source/core/animation/CSSBasicShapeInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSBasicShapeInterpolationType.cpp
index 1108a1e3cde766d08414d3a23894ff0637af55f6..c4f4fafe997d363e5064ce457698a6f61efb08c6 100644
--- a/third_party/WebKit/Source/core/animation/CSSBasicShapeInterpolationType.cpp
+++ b/third_party/WebKit/Source/core/animation/CSSBasicShapeInterpolationType.cpp
@@ -18,7 +18,7 @@ namespace blink {
namespace {
class UnderlyingCompatibilityChecker
- : public InterpolationType::ConversionChecker {
+ : public CSSInterpolationType::CSSConversionChecker {
public:
static std::unique_ptr<UnderlyingCompatibilityChecker> Create(
PassRefPtr<NonInterpolableValue> underlying_non_interpolable_value) {
@@ -32,7 +32,7 @@ class UnderlyingCompatibilityChecker
: underlying_non_interpolable_value_(
std::move(underlying_non_interpolable_value)) {}
- bool IsValid(const InterpolationEnvironment&,
+ bool IsValid(const StyleResolverState&,
const InterpolationValue& underlying) const final {
return BasicShapeInterpolationFunctions::ShapesAreCompatible(
*underlying_non_interpolable_value_,
@@ -42,7 +42,8 @@ class UnderlyingCompatibilityChecker
RefPtr<NonInterpolableValue> underlying_non_interpolable_value_;
};
-class InheritedShapeChecker : public InterpolationType::ConversionChecker {
+class InheritedShapeChecker
+ : public CSSInterpolationType::CSSConversionChecker {
public:
static std::unique_ptr<InheritedShapeChecker> Create(
CSSPropertyID property,
@@ -56,12 +57,11 @@ class InheritedShapeChecker : public InterpolationType::ConversionChecker {
PassRefPtr<BasicShape> inherited_shape)
: property_(property), inherited_shape_(std::move(inherited_shape)) {}
- bool IsValid(const InterpolationEnvironment& environment,
+ bool IsValid(const StyleResolverState& state,
const InterpolationValue&) const final {
- return DataEquivalent(
- inherited_shape_.Get(),
- BasicShapePropertyFunctions::GetBasicShape(
- property_, *environment.GetState().ParentStyle()));
+ return DataEquivalent(inherited_shape_.Get(),
+ BasicShapePropertyFunctions::GetBasicShape(
+ property_, *state.ParentStyle()));
}
const CSSPropertyID property_;
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/animation/CSSBorderImageLengthBoxInterpolationType.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698