cc/animation/layer_animation_controller.h - Issue 951673002: Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

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

Issue 951673002: Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b" (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 5 years, 10 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:

Index: cc/animation/layer_animation_controller.h

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

index d459515f5df365f3d68f96f3e4b571881d289656..48c3bdcaede9b1d330ec21beb0ae7cc1eafc289a 100644

--- a/cc/animation/layer_animation_controller.h

+++ b/cc/animation/layer_animation_controller.h

@@ -179,7 +179,10 @@ class CC_EXPORT LayerAnimationController

void TickAnimations(base::TimeTicks monotonic_time);

- enum UpdateActivationType { NORMAL_ACTIVATION, FORCE_ACTIVATION };

+ enum UpdateActivationType {

+ NormalActivation,

+ ForceActivation

+ };

void UpdateActivation(UpdateActivationType type);

void NotifyObserversOpacityAnimated(float opacity,

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