Add second copy request after screen rotation to flatten the layers in animation.

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"
 #include "base/callback_forward.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "ui/display/display.h"
 
 namespace cc {
+class CopyOutputRequest;
 class CopyOutputResult;
 }  // namespace cc
 
 namespace ui {
 class AnimationMetricsReporter;
 class Layer;
 class LayerTreeOwner;
 }  // namespace ui
 
 namespace ash {
@@ skipping 29 matching lines @@
 
   // 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();
 
  protected:
   using CopyCallback =
       base::Callback<void(std::unique_ptr<cc::CopyOutputResult> result)>;
   struct ScreenRotationRequest {
-    ScreenRotationRequest(display::Display::Rotation to_rotation,
-                          display::Display::RotationSource from_source)
-        : new_rotation(to_rotation), source(from_source) {}
+    ScreenRotationRequest(const display::Display::Rotation& from_rotation,

[oshima, 2017/04/07 20:48:56]

it's enum, so no need to pass by reference.

[wutao, 2017/04/10 08:01:07]

Done.

+                          const display::Display::Rotation& to_rotation,
+                          const display::Display::RotationSource& from_source)
+        : old_rotation(from_rotation),
+          new_rotation(to_rotation),
+          source(from_source) {}
+    display::Display::Rotation old_rotation;
     display::Display::Rotation new_rotation;
     display::Display::RotationSource source;
   };
 
   // This function can be overridden in unit test to test removing external
   // display.
-  virtual CopyCallback CreateAfterCopyCallback(
+  virtual CopyCallback CreateAfterCopyCallbackBeforeRotation(
+      std::unique_ptr<ScreenRotationRequest> rotation_request);
+  virtual CopyCallback CreateAfterCopyCallbackAfterRotation(
       std::unique_ptr<ScreenRotationRequest> rotation_request);
 
  private:
   friend class ash::test::ScreenRotationAnimatorTestApi;
 
   void StartRotationAnimation(
       std::unique_ptr<ScreenRotationRequest> rotation_request);
 
-  // This is an asynchronous call to request copy output of root layer.
-  void RequestCopyRootLayerAndAnimateRotation(
+  // The fallback to slow animation if copy output request cancled or failed.
+  void StartSlowAnimation(
       std::unique_ptr<ScreenRotationRequest> rotation_request);
 
-  // The callback in |RequestCopyRootLayerAndAnimateRotation()|.
-  void OnRootLayerCopiedBeforeRotation(
+  // A wrapper to call |display_manager| to set screen rotation and rotate the
+  // |old_layer_tree| to the |old_rotation|.
+  void SetRotation(const display::Display::Rotation& new_rotation,
+                   const display::Display::Rotation& old_rotation,
+                   const display::Display::RotationSource& source);
+
+  // This is an asynchronous call to request copy output of root layer.
+  void RequestCopyScreenRotationContainerLayer(
+      std::unique_ptr<cc::CopyOutputRequest> copy_output_request);
+
+  // The callback in |RequestCopyScreenRotationContainerLayer()| before screen
+  // rotation.
+  void OnScreenRotationContainerLayerCopiedBeforeRotation(
+      std::unique_ptr<ScreenRotationRequest> rotation_request,
+      std::unique_ptr<cc::CopyOutputResult> result);

[oshima, 2017/04/07 20:48:57]

new line after this

[wutao, 2017/04/10 08:01:07]

Done.

+  // The callback in |RequestCopyScreenRotationContainerLayer()| after screen
+  // rotation.
+  void OnScreenRotationContainerLayerCopiedAfterRotation(
       std::unique_ptr<ScreenRotationRequest> rotation_request,
       std::unique_ptr<cc::CopyOutputResult> result);
 
   // Recreates all |root_window| layers.
   void CreateOldLayerTree();
 
-  // Requests a copy of |root_window| root layer output.
-  void CopyOldLayerTree(std::unique_ptr<cc::CopyOutputResult> result);
+  // Creates a new layer from |CopyOutputResult|.

[oshima, 2017/04/07 20:48:57]

new layer and its layer tree owner

[wutao, 2017/04/10 08:01:07]

Done.

+  std::unique_ptr<ui::LayerTreeOwner> CopyLayerTree(
+      std::unique_ptr<cc::CopyOutputResult> result);
 
   // Note: Only call this function when the |old_layer_tree_owner_| is set up
   // properly.
   // Sets the screen orientation to |new_rotation| and animate the change. The
   // animation will rotate the initial orientation's layer towards the new
   // orientation through |rotation_degrees| while fading out, and the new
   // 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);
 
   void StopAnimating();
 
   // The id of the display to rotate.
   int64_t display_id_;
   bool is_rotating_;
   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<ScreenRotationRequest> last_pending_request_;
   base::WeakPtrFactory<ScreenRotationAnimator> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenRotationAnimator);
 };
 
 }  // namespace ash
 
 #endif  // ASH_ROTATOR_SCREEN_ROTATION_ANIMATOR_H_