third_party/WebKit/Source/core/animation/ImageListInterpolationType.h - Issue 1394343003: Web Animations: Remove CSS dependence from InterpolationType

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/ImageListInterpolationType.h

Issue 1394343003: Web Animations: Remove CSS dependence from InterpolationType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@_specialCase0and1

Patch Set: NIVs 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

« no previous file with comments | « third_party/WebKit/Source/core/animation/ImageInterpolationType.cpp ('k') | third_party/WebKit/Source/core/animation/ImageListInterpolationType.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/animation/ImageListInterpolationType.h

diff --git a/third_party/WebKit/Source/core/animation/ImageListInterpolationType.h b/third_party/WebKit/Source/core/animation/ImageListInterpolationType.h

index 7f5643b1906cbd034f9725b0b3200e61d0842d83..8e40f8364d6f5957fdadc760e22164c804098e8b 100644

--- a/third_party/WebKit/Source/core/animation/ImageListInterpolationType.h

+++ b/third_party/WebKit/Source/core/animation/ImageListInterpolationType.h

@@ -5,20 +5,20 @@

#ifndef ImageListInterpolationType_h

#define ImageListInterpolationType_h

+#include "core/animation/CSSInterpolationType.h"

#include "core/animation/ImageListPropertyFunctions.h"

-#include "core/animation/InterpolationType.h"

namespace blink {

-class ImageListInterpolationType : public InterpolationType {

+class ImageListInterpolationType : public CSSInterpolationType {

public:

ImageListInterpolationType(CSSPropertyID property)

- : InterpolationType(property)

+ : CSSInterpolationType(property)

{ }

- PassOwnPtr<InterpolationValue> maybeConvertUnderlyingValue(const StyleResolverState&) const final;

+ PassOwnPtr<InterpolationValue> maybeConvertUnderlyingValue(const InterpolationEnvironment&) const final;

void composite(UnderlyingValue&, double underlyingFraction, const InterpolationValue&) const final;

- void apply(const InterpolableValue&, const NonInterpolableValue*, StyleResolverState&) const final;

+ void apply(const InterpolableValue&, const NonInterpolableValue*, InterpolationEnvironment&) const final;

private:

PassOwnPtr<InterpolationValue> maybeConvertStyleImageList(const StyleImageList&) const;