cc/animation/animation.h - Issue 1151763011: Fix assumptions made in LAC::MarkAnimationsForDeletion

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

Issue 1151763011: Fix assumptions made in LAC::MarkAnimationsForDeletion (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

Index: cc/animation/animation.h

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

index 2677fdeff58e8930aad793bde0ee6b5ad2622550..153e4ef77527f6517cf5c15104ccdcf38a04c89c 100644

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

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

@@ -151,6 +151,9 @@ class CC_EXPORT Animation {

scoped_ptr<Animation> CloneAndInitialize(RunState initial_run_state) const;

+ void set_is_controlling_instance_for_test(bool is_controlling_instance) {

+ is_controlling_instance_ = is_controlling_instance;

+ }

bool is_controlling_instance() const { return is_controlling_instance_; }

void PushPropertiesTo(Animation* other) const;

« no previous file with comments | « no previous file | cc/animation/layer_animation_controller.cc » ('j') | cc/trees/layer_tree_host_unittest_animation.cc » ('J')