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

Unified Diff: third_party/WebKit/Source/core/animation/CSSImageInterpolationType.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
Index: third_party/WebKit/Source/core/animation/CSSImageInterpolationType.cpp
diff --git a/third_party/WebKit/Source/core/animation/CSSImageInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSImageInterpolationType.cpp
index 15144f617343d2b2a83294e9c3d5977e2e9270b9..b8daf3517bb70849c36c7bbeb8dc4ba0357010c6 100644
--- a/third_party/WebKit/Source/core/animation/CSSImageInterpolationType.cpp
+++ b/third_party/WebKit/Source/core/animation/CSSImageInterpolationType.cpp
@@ -129,7 +129,8 @@ bool CSSImageInterpolationType::EqualNonInterpolableValues(
ToCSSImageNonInterpolableValue(*b));
}
-class UnderlyingImageChecker : public InterpolationType::ConversionChecker {
+class UnderlyingImageChecker
+ : public CSSInterpolationType::CSSConversionChecker {
public:
~UnderlyingImageChecker() final {}
@@ -142,7 +143,7 @@ class UnderlyingImageChecker : public InterpolationType::ConversionChecker {
UnderlyingImageChecker(const InterpolationValue& underlying)
: underlying_(underlying.Clone()) {}
- bool IsValid(const InterpolationEnvironment&,
+ bool IsValid(const StyleResolverState&,
const InterpolationValue& underlying) const final {
if (!underlying && !underlying_)
return true;
@@ -172,7 +173,8 @@ InterpolationValue CSSImageInterpolationType::MaybeConvertInitial(
ImagePropertyFunctions::GetInitialStyleImage(CssProperty()), true);
}
-class InheritedImageChecker : public InterpolationType::ConversionChecker {
+class InheritedImageChecker
+ : public CSSInterpolationType::CSSConversionChecker {
public:
~InheritedImageChecker() final {}
@@ -187,10 +189,10 @@ class InheritedImageChecker : public InterpolationType::ConversionChecker {
InheritedImageChecker(CSSPropertyID property, StyleImage* inherited_image)
: property_(property), inherited_image_(inherited_image) {}
- bool IsValid(const InterpolationEnvironment& environment,
+ bool IsValid(const StyleResolverState& state,
const InterpolationValue& underlying) const final {
- const StyleImage* inherited_image = ImagePropertyFunctions::GetStyleImage(
- property_, *environment.GetState().ParentStyle());
+ const StyleImage* inherited_image =
+ ImagePropertyFunctions::GetStyleImage(property_, *state.ParentStyle());
if (!inherited_image_ && !inherited_image)
return true;
if (!inherited_image_ || !inherited_image)

Powered by Google App Engine
This is Rietveld 408576698