Add screen rotation animator lock.

ash/rotator/screen_rotation_animator.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_ROTATOR_SCREEN_ROTATION_ANIMATOR_H_
 #define ASH_ROTATOR_SCREEN_ROTATION_ANIMATOR_H_
 
 #include <stdint.h>
 
 #include "ash/ash_export.h"
@@ skipping 17 matching lines @@
 class Layer;
 class LayerOwner;
 class LayerTreeOwner;
 }  // namespace ui
 
 namespace ash {
 namespace test {
 class ScreenRotationAnimatorTestApi;
 }  // namespace test
 
+class ScreenRotationAnimatorLock;
 class ScreenRotationAnimatorObserver;
 
 // Utility to perform a screen rotation with an animation.
 class ASH_EXPORT ScreenRotationAnimator {
  public:
   explicit ScreenRotationAnimator(int64_t display_id);
   virtual ~ScreenRotationAnimator();
 
   // Rotates the display::Display specified by |display_id_| to the
   // |new_rotation| orientation, for the given |source|. The rotation will also
@@ skipping 11 matching lines @@
   void AddScreenRotationAnimatorObserver(
       ScreenRotationAnimatorObserver* observer);
   void RemoveScreenRotationAnimatorObserver(
       ScreenRotationAnimatorObserver* observer);
 
   // When screen rotation animation is ended or aborted, calls |Rotate()| with
   // the pending rotation request if the request queue is not empty. Otherwise
   // notifies |screen_rotation_animator_observer_|.
   void ProcessAnimationQueue();
 
+  void AddAnimatorLock(ScreenRotationAnimatorLock* lock);
+  void RemoveAnimatorLock(ScreenRotationAnimatorLock* lock);
+
  protected:
   using CopyCallback =
       base::Callback<void(std::unique_ptr<cc::CopyOutputResult> result)>;
   struct ScreenRotationRequest {
     ScreenRotationRequest(int64_t id,
                           display::Display::Rotation to_rotation,
                           display::Display::RotationSource from_source)
         : id(id), new_rotation(to_rotation), source(from_source) {}
     int64_t id;
     display::Display::Rotation old_rotation;
@@ skipping 64 matching lines @@
   // orientation's layer will be rotated in to the |new_orientation| through
   // |rotation_degrees| arc.
   void AnimateRotation(std::unique_ptr<ScreenRotationRequest> rotation_request);
 
   void set_disable_animation_timers_for_test(bool disable_timers) {
     disable_animation_timers_for_test_ = disable_timers;
   }
 
   void StopAnimating();
 
+  ScreenRotationAnimatorLock* CreateAnimatorLock();
+  void TimeoutAnimatorLocks();
+  void ResetCreatedAnimatorLocks();
+
   // The id of the display to rotate.
   int64_t display_id_;
 
   // For current slow rotation animation, there are two states |ROTATING| and
   // |IDLE|. For the smooth rotation animation, we need to send copy request
   // and get copy result before animating.
   enum ScreenRotationState {
     COPY_REQUESTED,
     ROTATING,
     IDLE,
   };
   ScreenRotationState screen_rotation_state_;
 
   // Rotation request id, used to ignore copy request callback if we decide to
   // cancel the previous rotation request.
   int64_t rotation_request_id_;
 
+  // The cached rotation request while waiting for the animator lock.
+  std::unique_ptr<ScreenRotationRequest> rotation_request_after_unlock_;
+  // The active locks waiting for.
+  std::vector<ScreenRotationAnimatorLock*> active_locks_;
+  // All the unique_ptr of the locks created. Hold the ownership so that we can
+  // release after animation.
+  std::vector<std::unique_ptr<ScreenRotationAnimatorLock>> created_locks_;
+
   std::unique_ptr<ui::AnimationMetricsReporter> metrics_reporter_;
   // Only set in unittest to disable animation timers.
   bool disable_animation_timers_for_test_;
   base::ObserverList<ScreenRotationAnimatorObserver>
       screen_rotation_animator_observers_;
   std::unique_ptr<ui::LayerTreeOwner> old_layer_tree_owner_;
   std::unique_ptr<ui::LayerTreeOwner> new_layer_tree_owner_;
   std::unique_ptr<ui::LayerOwner> black_mask_layer_owner_;
   std::unique_ptr<ScreenRotationRequest> last_pending_request_;
   bool has_switch_ash_disable_smooth_screen_rotation_;
   aura::Window* root_window_;
   ui::Layer* screen_rotation_container_layer_;
   base::WeakPtrFactory<ScreenRotationAnimator> weak_factory_;
+  base::WeakPtrFactory<ScreenRotationAnimator> lock_weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenRotationAnimator);
 };
 
 }  // namespace ash
 
 #endif  // ASH_ROTATOR_SCREEN_ROTATION_ANIMATOR_H_