third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.cpp - Issue 2346193002: Split CSSPrimitiveValue into CSSPrimitiveValue and CSSIdentifierValue

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2346193002: Split CSSPrimitiveValue into CSSPrimitiveValue and CSSIdentifierValue (Closed)

Patch Set: Rebase Created 4 years, 3 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 | « third_party/WebKit/Source/core/animation/CSSImageSliceInterpolationType.cpp ('k') | third_party/WebKit/Source/core/animation/CSSPathInterpolationType.cpp » ('j') | third_party/WebKit/Source/core/css/CSSPrimitiveValue.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 0100e1b6074d934fb89052ee9f70598ac6fad49b..03faf44ac41d6b6377a31d477b5a27f732e532e0 100644

--- a/third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.cpp

+++ b/third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.cpp

@@ -8,6 +8,7 @@

#include "core/animation/LengthPropertyFunctions.h"

#include "core/animation/css/CSSAnimatableValueFactory.h"

#include "core/css/CSSCalculationValue.h"

+#include "core/css/CSSIdentifierValue.h"

#include "core/css/resolver/StyleBuilder.h"

#include "core/css/resolver/StyleResolverState.h"

#include "platform/LengthFunctions.h"

@@ -77,8 +78,8 @@ InterpolationValue CSSLengthInterpolationType::maybeConvertInherit(const StyleRe

InterpolationValue CSSLengthInterpolationType::maybeConvertValue(const CSSValue& value, const StyleResolverState&, ConversionCheckers& conversionCheckers) const

{

- if (value.isPrimitiveValue() && toCSSPrimitiveValue(value).isValueID()) {

- CSSValueID valueID = toCSSPrimitiveValue(value).getValueID();

+ if (value.isIdentifierValue()) {

+ CSSValueID valueID = toCSSIdentifierValue(value).getValueID();

double pixels;

if (!LengthPropertyFunctions::getPixelsForKeyword(cssProperty(), valueID, pixels))

return nullptr;

@@ -121,7 +122,7 @@ void CSSLengthInterpolationType::apply(const InterpolableValue& interpolableValu

Length before;

Length after;

DCHECK(LengthPropertyFunctions::getLength(cssProperty(), style, before));

- StyleBuilder::applyProperty(cssProperty(), state, *CSSPrimitiveValue::create(length, zoom));

+ StyleBuilder::applyProperty(cssProperty(), state, *CSSValue::create(length, zoom));

DCHECK(LengthPropertyFunctions::getLength(cssProperty(), style, after));

DCHECK_EQ(before.type(), after.type());

if (before.isSpecified()) {

@@ -132,7 +133,7 @@ void CSSLengthInterpolationType::apply(const InterpolableValue& interpolableValu

#endif

return;

}

- StyleBuilder::applyProperty(cssProperty(), state, *CSSPrimitiveValue::create(length, zoom));

+ StyleBuilder::applyProperty(cssProperty(), state, *CSSValue::create(length, zoom));

}

} // namespace blink