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

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

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 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 unified diff | Download patch
« no previous file with comments | « ui/compositor/layer_animation_sequence_unittest.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 325 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 336
337 // Cleans up any running animations that may have been deleted. 337 // Cleans up any running animations that may have been deleted.
338 void PurgeDeletedAnimations(); 338 void PurgeDeletedAnimations();
339 339
340 LayerAnimatorCollection* GetLayerAnimatorCollection(); 340 LayerAnimatorCollection* GetLayerAnimatorCollection();
341 341
342 // LayerAnimationEventObserver 342 // LayerAnimationEventObserver
343 void OnAnimationStarted(const cc::AnimationEvent& event) override; 343 void OnAnimationStarted(const cc::AnimationEvent& event) override;
344 344
345 // Implementation of LayerThreadedAnimationDelegate. 345 // Implementation of LayerThreadedAnimationDelegate.
346 void AddThreadedAnimation(scoped_ptr<cc::Animation> animation) override; 346 void AddThreadedAnimation(std::unique_ptr<cc::Animation> animation) override;
347 void RemoveThreadedAnimation(int animation_id) override; 347 void RemoveThreadedAnimation(int animation_id) override;
348 348
349 void AttachLayerToAnimationPlayer(int layer_id); 349 void AttachLayerToAnimationPlayer(int layer_id);
350 void DetachLayerFromAnimationPlayer(); 350 void DetachLayerFromAnimationPlayer();
351 351
352 // This is the queue of animations to run. 352 // This is the queue of animations to run.
353 AnimationQueue animation_queue_; 353 AnimationQueue animation_queue_;
354 354
355 // The target of all layer animations. 355 // The target of all layer animations.
356 LayerAnimationDelegate* delegate_; 356 LayerAnimationDelegate* delegate_;
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 // ResetCompositor/SetCompositor scope. 396 // ResetCompositor/SetCompositor scope.
397 // TODO(loyso): Remove it. crbug.com/592873. 397 // TODO(loyso): Remove it. crbug.com/592873.
398 scoped_refptr<cc::LayerAnimationController> animation_controller_state_; 398 scoped_refptr<cc::LayerAnimationController> animation_controller_state_;
399 399
400 DISALLOW_COPY_AND_ASSIGN(LayerAnimator); 400 DISALLOW_COPY_AND_ASSIGN(LayerAnimator);
401 }; 401 };
402 402
403 } // namespace ui 403 } // namespace ui
404 404
405 #endif // UI_COMPOSITOR_LAYER_ANIMATOR_H_ 405 #endif // UI_COMPOSITOR_LAYER_ANIMATOR_H_
OLDNEW
« no previous file with comments | « ui/compositor/layer_animation_sequence_unittest.cc ('k') | ui/compositor/layer_animator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698