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

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

Issue 2453573003: Web Animations: consistent naming for parent style checkers (Closed)
Patch Set: inheritedValue Created 4 years, 2 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/CSSShadowListInterpolationType.cpp
diff --git a/third_party/WebKit/Source/core/animation/CSSShadowListInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSShadowListInterpolationType.cpp
index ffa3760c191c3152055609970958dc28031bae98..4659cfa06c5c50b399a24eb487565329c2343d2e 100644
--- a/third_party/WebKit/Source/core/animation/CSSShadowListInterpolationType.cpp
+++ b/third_party/WebKit/Source/core/animation/CSSShadowListInterpolationType.cpp
@@ -47,30 +47,30 @@ InterpolationValue CSSShadowListInterpolationType::maybeConvertInitial(
ShadowListPropertyFunctions::getInitialShadowList(cssProperty()), 1);
}
-class ParentShadowListChecker : public InterpolationType::ConversionChecker {
+class InheritedShadowListChecker : public InterpolationType::ConversionChecker {
public:
- static std::unique_ptr<ParentShadowListChecker> create(
+ static std::unique_ptr<InheritedShadowListChecker> create(
CSSPropertyID property,
PassRefPtr<ShadowList> shadowList) {
return wrapUnique(
- new ParentShadowListChecker(property, std::move(shadowList)));
+ new InheritedShadowListChecker(property, std::move(shadowList)));
}
private:
- ParentShadowListChecker(CSSPropertyID property,
- PassRefPtr<ShadowList> shadowList)
+ InheritedShadowListChecker(CSSPropertyID property,
+ PassRefPtr<ShadowList> shadowList)
: m_property(property), m_shadowList(shadowList) {}
bool isValid(const InterpolationEnvironment& environment,
const InterpolationValue& underlying) const final {
- const ShadowList* parentShadowList =
+ const ShadowList* inheritedShadowList =
ShadowListPropertyFunctions::getShadowList(
m_property, *environment.state().parentStyle());
- if (!parentShadowList && !m_shadowList)
+ if (!inheritedShadowList && !m_shadowList)
return true;
- if (!parentShadowList || !m_shadowList)
+ if (!inheritedShadowList || !m_shadowList)
return false;
- return *parentShadowList == *m_shadowList;
+ return *inheritedShadowList == *m_shadowList;
}
const CSSPropertyID m_property;
@@ -82,12 +82,13 @@ InterpolationValue CSSShadowListInterpolationType::maybeConvertInherit(
ConversionCheckers& conversionCheckers) const {
if (!state.parentStyle())
return nullptr;
- const ShadowList* parentShadowList =
+ const ShadowList* inheritedShadowList =
ShadowListPropertyFunctions::getShadowList(cssProperty(),
*state.parentStyle());
- conversionCheckers.append(ParentShadowListChecker::create(
- cssProperty(), const_cast<ShadowList*>(parentShadowList))); // Take ref.
- return convertShadowList(parentShadowList,
+ conversionCheckers.append(InheritedShadowListChecker::create(
+ cssProperty(),
+ const_cast<ShadowList*>(inheritedShadowList))); // Take ref.
+ return convertShadowList(inheritedShadowList,
state.parentStyle()->effectiveZoom());
}

Powered by Google App Engine
This is Rietveld 408576698