Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(407)

Side by Side Diff: ui/compositor/layer_animator.h

Issue 10882043: Revert 153291 - Fixes crash introduced @ 153047 (you can hit crash by maximizing a (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/compositor/layer_animation_observer.cc ('k') | ui/compositor/layer_animator.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_COMPOSITOR_LAYER_ANIMATOR_H_ 5 #ifndef UI_COMPOSITOR_LAYER_ANIMATOR_H_
6 #define UI_COMPOSITOR_LAYER_ANIMATOR_H_ 6 #define UI_COMPOSITOR_LAYER_ANIMATOR_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 // Slows down all animations for visual debugging. 299 // Slows down all animations for visual debugging.
300 static bool slow_animation_mode_; 300 static bool slow_animation_mode_;
301 301
302 // Amount to slow animations for debugging. 302 // Amount to slow animations for debugging.
303 static int slow_animation_scale_factor_; 303 static int slow_animation_scale_factor_;
304 304
305 // Observers are notified when layer animations end, are scheduled or are 305 // Observers are notified when layer animations end, are scheduled or are
306 // aborted. 306 // aborted.
307 ObserverList<LayerAnimationObserver> observers_; 307 ObserverList<LayerAnimationObserver> observers_;
308 308
309 // Set to true in the destructor (if non-NULL). Used to detect deletion while
310 // calling out.
311 bool* destroyed_;
312
313 DISALLOW_COPY_AND_ASSIGN(LayerAnimator); 309 DISALLOW_COPY_AND_ASSIGN(LayerAnimator);
314 }; 310 };
315 311
316 } // namespace ui 312 } // namespace ui
317 313
318 #endif // UI_COMPOSITOR_LAYER_ANIMATOR_H_ 314 #endif // UI_COMPOSITOR_LAYER_ANIMATOR_H_
OLDNEW
« no previous file with comments | « ui/compositor/layer_animation_observer.cc ('k') | ui/compositor/layer_animator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698