third_party/WebKit/Source/core/animation/CSSColorInterpolationType.cpp - Issue 1885353004: Add ComputedStyle constructor and getter to InterpolationEnvironment

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/CSSColorInterpolationType.cpp

Issue 1885353004: Add ComputedStyle constructor and getter to InterpolationEnvironment (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@_transformInterpolationType

Patch Set: Rebased Created 4 years, 4 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/CSSClipInterpolationType.cpp ('k') | third_party/WebKit/Source/core/animation/CSSFilterListInterpolationType.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/animation/CSSColorInterpolationType.cpp

diff --git a/third_party/WebKit/Source/core/animation/CSSColorInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSColorInterpolationType.cpp

index 06264b13c8c8efd4a9feb3767c0ac0203e9b8fb5..2b1254391aba2f6cc526566a33ab3af752330257 100644

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

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

@@ -209,17 +209,17 @@ InterpolationValue CSSColorInterpolationType::convertStyleColorPair(const StyleC

InterpolationValue CSSColorInterpolationType::maybeConvertUnderlyingValue(const InterpolationEnvironment& environment) const

{

return convertStyleColorPair(

- ColorPropertyFunctions::getUnvisitedColor(cssProperty(), *environment.state().style()),

- ColorPropertyFunctions::getVisitedColor(cssProperty(), *environment.state().style()));

+ ColorPropertyFunctions::getUnvisitedColor(cssProperty(), environment.style()),

+ ColorPropertyFunctions::getVisitedColor(cssProperty(), environment.style()));

}

void CSSColorInterpolationType::apply(const InterpolableValue& interpolableValue, const NonInterpolableValue*, InterpolationEnvironment& environment) const

{

const InterpolableList& colorPair = toInterpolableList(interpolableValue);

ASSERT(colorPair.length() == InterpolableColorPairIndexCount);

- ColorPropertyFunctions::setUnvisitedColor(cssProperty(), *environment.state().style(),

+ ColorPropertyFunctions::setUnvisitedColor(cssProperty(), environment.style(),

resolveInterpolableColor(*colorPair.get(Unvisited), environment.state(), false, cssProperty() == CSSPropertyTextDecorationColor));

- ColorPropertyFunctions::setVisitedColor(cssProperty(), *environment.state().style(),

+ ColorPropertyFunctions::setVisitedColor(cssProperty(), environment.style(),

resolveInterpolableColor(*colorPair.get(Visited), environment.state(), true, cssProperty() == CSSPropertyTextDecorationColor));

}