diff options
| author | vollick <vollick@chromium.org> | 2015-06-19 08:42:43 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-19 15:43:25 +0000 |
| commit | 7324fb5f10b801ed49b4e1c8d743becded6d2ed3 (patch) | |
| tree | 40e0236b371d6ebba24196782f1cab61fef03833 /cc/animation/animation.h | |
| parent | f3930cfae7a93c5065588c9ba7be5c6927f46588 (diff) | |
| download | chromium_src-7324fb5f10b801ed49b4e1c8d743becded6d2ed3.zip chromium_src-7324fb5f10b801ed49b4e1c8d743becded6d2ed3.tar.gz chromium_src-7324fb5f10b801ed49b4e1c8d743becded6d2ed3.tar.bz2 | |
Fix assumptions made in LAC::MarkAnimationsForDeletion
lof84 correctly noticed that this function was using broken logic to
determine if we were on the impl thread (i.e., a non-null events
vector). This got broken in my cl
https://codereview.chromium.org/1088773003, which collects events on
the main thread as well.
The test in this CL was taken directly from lof84's original patch:
http://crrev.com/1154323011
BUG=None
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1151763011
Cr-Commit-Position: refs/heads/master@{#335262}
Diffstat (limited to 'cc/animation/animation.h')
| -rw-r--r-- | cc/animation/animation.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cc/animation/animation.h b/cc/animation/animation.h index 2677fde..153e4ef 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; |