Source/core/platform/graphics/chromium/AnimationTranslationUtil.cpp - Issue 14391005: Rename Animation -> PrimitiveAnimation

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: Source/core/platform/graphics/chromium/AnimationTranslationUtil.cpp

Issue 14391005: Rename Animation -> PrimitiveAnimation (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Update to long paths Created 7 years, 8 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 | « Source/core/platform/graphics/chromium/AnimationTranslationUtil.h ('k') | Source/core/platform/graphics/chromium/GraphicsLayerChromium.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/platform/graphics/chromium/AnimationTranslationUtil.cpp

diff --git a/Source/core/platform/graphics/chromium/AnimationTranslationUtil.cpp b/Source/core/platform/graphics/chromium/AnimationTranslationUtil.cpp

index 2788f1cb3aaeff9d22f1fc54fc354996279e8185..def63207b5a071da8f95d4d889724c09ce19fb3c 100644

--- a/Source/core/platform/graphics/chromium/AnimationTranslationUtil.cpp

+++ b/Source/core/platform/graphics/chromium/AnimationTranslationUtil.cpp

@@ -193,15 +193,15 @@ bool appendKeyframeWithCustomBezierTimingFunction<TransformAnimationValue, WebTr

}

template <class Value, class Keyframe, class Curve>

-PassOwnPtr<WebKit::WebAnimation> createWebAnimation(const KeyframeValueList& valueList, const Animation* animation, int animationId, double timeOffset, Curve* curve, WebKit::WebAnimation::TargetProperty targetProperty, const FloatSize& boxSize)

+PassOwnPtr<WebKit::WebAnimation> createWebAnimation(const KeyframeValueList& valueList, const CSSAnimationData* animation, int animationId, double timeOffset, Curve* curve, WebKit::WebAnimation::TargetProperty targetProperty, const FloatSize& boxSize)

{

bool alternate = false;

bool reverse = false;

if (animation && animation->isDirectionSet()) {

- Animation::AnimationDirection direction = animation->direction();

- if (direction == Animation::AnimationDirectionAlternate || direction == Animation::AnimationDirectionAlternateReverse)

+ CSSAnimationData::AnimationDirection direction = animation->direction();

+ if (direction == CSSAnimationData::AnimationDirectionAlternate || direction == CSSAnimationData::AnimationDirectionAlternateReverse)

alternate = true;

- if (direction == Animation::AnimationDirectionReverse || direction == Animation::AnimationDirectionAlternateReverse)

+ if (direction == CSSAnimationData::AnimationDirectionReverse || direction == CSSAnimationData::AnimationDirectionAlternateReverse)

reverse = true;

}

@@ -274,7 +274,7 @@ PassOwnPtr<WebKit::WebAnimation> createWebAnimation(const KeyframeValueList& val

return webAnimation.release();

}

-PassOwnPtr<WebKit::WebAnimation> createWebAnimation(const KeyframeValueList& values, const Animation* animation, int animationId, double timeOffset, const FloatSize& boxSize)

+PassOwnPtr<WebKit::WebAnimation> createWebAnimation(const KeyframeValueList& values, const CSSAnimationData* animation, int animationId, double timeOffset, const FloatSize& boxSize)

{