Wallpaper resize extents compositor lock timeout.

ash/rotator/screen_rotation_animator.cc

 // 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.
 
 #include "ash/rotator/screen_rotation_animator.h"
 
 #include "ash/ash_switches.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/rotator/screen_rotation_animation.h"
@@ skipping 207 matching lines @@
   CreateOldLayerTreeForSlowAnimation();
   SetRotation(rotation_request->old_rotation, rotation_request->new_rotation,
               rotation_request->source);
   AnimateRotation(std::move(rotation_request));
 }
 
 void ScreenRotationAnimator::SetRotation(
     display::Display::Rotation old_rotation,
     display::Display::Rotation new_rotation,
     display::Display::RotationSource source) {
+  // Allow compositor locks to extend timeout, so that screen rotation only
+  // takes output copy after contents are properlly resized, such as wallpaper
+  // and ARC apps.
+  ui::Compositor* compositor = root_window_->layer()->GetCompositor();
+  compositor->set_allow_locks_to_extend_timeout(true);
   Shell::Get()->display_manager()->SetDisplayRotation(display_id_, new_rotation,
                                                       source);
   const display::Display display =
       Shell::Get()->display_manager()->GetDisplayForId(display_id_);
   old_layer_tree_owner_->root()->SetTransform(
       CreateScreenRotationOldLayerTransformForDisplay(old_rotation,
                                                       new_rotation, display));
+  compositor->set_allow_locks_to_extend_timeout(false);

[oshima, 2017/05/10 05:27:50]

move this to 235, after SetDisplayRotation

[wutao, 2017/05/10 21:07:55]

Done.

 }
 
 void ScreenRotationAnimator::RequestCopyScreenRotationContainerLayer(
     std::unique_ptr<cc::CopyOutputRequest> copy_output_request) {
   copy_output_request->set_area(
       gfx::Rect(screen_rotation_container_layer_->size()));
   screen_rotation_container_layer_->RequestCopyOfOutput(
       std::move(copy_output_request));
 }
 
@@ skipping 239 matching lines @@
   // the rotation request comes before the copy request finished.
   if (old_layer_tree_owner_)
     old_layer_tree_owner_->root()->GetAnimator()->StopAnimating();
   if (new_layer_tree_owner_)
     new_layer_tree_owner_->root()->GetAnimator()->StopAnimating();
   if (IsDisplayIdValid(display_id_) && black_mask_layer_owner_)
     root_window_->layer()->Remove(black_mask_layer_owner_->layer());
 }
 
 }  // namespace ash