cc/animation/keyframed_animation_curve.h - Issue 723343002: Update from https://crrev.com/304121

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: cc/animation/keyframed_animation_curve.h

Issue 723343002: Update from https://crrev.com/304121 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 6 years, 1 month 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: cc/animation/keyframed_animation_curve.h

diff --git a/cc/animation/keyframed_animation_curve.h b/cc/animation/keyframed_animation_curve.h

index a6e6740e560dd588c7c5cfd260a85e2af4428eef..ff746fead68381470cedc0c7bd6688db0dcbbd64 100644

--- a/cc/animation/keyframed_animation_curve.h

+++ b/cc/animation/keyframed_animation_curve.h

@@ -5,6 +5,7 @@

#ifndef CC_ANIMATION_KEYFRAMED_ANIMATION_CURVE_H_

#define CC_ANIMATION_KEYFRAMED_ANIMATION_CURVE_H_

+#include "base/time/time.h"

#include "cc/animation/animation_curve.h"

#include "cc/animation/timing_function.h"

#include "cc/animation/transform_operations.h"

@@ -126,7 +127,7 @@ class CC_EXPORT KeyframedColorAnimationCurve : public ColorAnimationCurve {

}

// AnimationCurve implementation

- double Duration() const override;

+ base::TimeDelta Duration() const override;

scoped_ptr<AnimationCurve> Clone() const override;

// BackgrounColorAnimationCurve implementation

@@ -156,7 +157,7 @@ class CC_EXPORT KeyframedFloatAnimationCurve : public FloatAnimationCurve {

}

// AnimationCurve implementation

- double Duration() const override;

+ base::TimeDelta Duration() const override;

scoped_ptr<AnimationCurve> Clone() const override;

// FloatAnimationCurve implementation

@@ -187,7 +188,7 @@ class CC_EXPORT KeyframedTransformAnimationCurve

}

// AnimationCurve implementation

- double Duration() const override;

+ base::TimeDelta Duration() const override;

scoped_ptr<AnimationCurve> Clone() const override;

// TransformAnimationCurve implementation

@@ -224,7 +225,7 @@ class CC_EXPORT KeyframedFilterAnimationCurve

}

// AnimationCurve implementation

- double Duration() const override;

+ base::TimeDelta Duration() const override;

scoped_ptr<AnimationCurve> Clone() const override;

// FilterAnimationCurve implementation

« no previous file with comments | « cc/animation/animation_unittest.cc ('k') | cc/animation/keyframed_animation_curve.cc » ('j') | no next file with comments »