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

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

Issue 1428513003: Pass InterpolationEnvironment as a reference to InterpolationType conversion functions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@_svgAttributeReference
Patch Set: Created 5 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/CSSLengthInterpolationType.cpp
diff --git a/third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.cpp
index 80fb4cfdbd8e8c413d83e1165f0eaf9279667f0a..3c9e04e620b46b68ec44dbbca48f34e141e74d67 100644
--- a/third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.cpp
+++ b/third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.cpp
@@ -147,18 +147,18 @@ PassOwnPtr<InterpolationValue> CSSLengthInterpolationType::maybeConvertInitial()
return maybeConvertLength(initialLength, 1);
}
-PassOwnPtr<InterpolationValue> CSSLengthInterpolationType::maybeConvertInherit(const StyleResolverState* state, ConversionCheckers& conversionCheckers) const
+PassOwnPtr<InterpolationValue> CSSLengthInterpolationType::maybeConvertInherit(const StyleResolverState& state, ConversionCheckers& conversionCheckers) const
{
- if (!state || !state->parentStyle())
+ if (!state.parentStyle())
return nullptr;
Length inheritedLength;
- if (!LengthPropertyFunctions::getLength(cssProperty(), *state->parentStyle(), inheritedLength))
+ if (!LengthPropertyFunctions::getLength(cssProperty(), *state.parentStyle(), inheritedLength))
return nullptr;
conversionCheckers.append(ParentLengthChecker::create(*this, cssProperty(), inheritedLength));
- return maybeConvertLength(inheritedLength, effectiveZoom(*state->parentStyle()));
+ return maybeConvertLength(inheritedLength, effectiveZoom(*state.parentStyle()));
}
-PassOwnPtr<InterpolationValue> CSSLengthInterpolationType::maybeConvertValue(const CSSValue& value, const StyleResolverState*, ConversionCheckers& conversionCheckers) const
+PassOwnPtr<InterpolationValue> CSSLengthInterpolationType::maybeConvertValue(const CSSValue& value, const StyleResolverState&, ConversionCheckers& conversionCheckers) const
{
if (value.isPrimitiveValue() && toCSSPrimitiveValue(value).isValueID()) {
CSSValueID valueID = toCSSPrimitiveValue(value).getValueID();

Powered by Google App Engine
This is Rietveld 408576698