Aura: Resize locks with --ui-enable-threaded-compositing

ash/wm/window_animations.cc

 // Copyright (c) 2012 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/wm/window_animations.h"
 
 #include <math.h>
 
 #include <algorithm>
 #include <vector>
@@ skipping 499 matching lines @@
       ui::LayerAnimationElement::CreateBrightnessElement(
           end_value,
           base::TimeDelta::FromMilliseconds(
               kBrightnessGrayscaleFadeDurationMs)));
   grayscale_sequence->AddElement(
       ui::LayerAnimationElement::CreateGrayscaleElement(
           end_value,
           base::TimeDelta::FromMilliseconds(
               kBrightnessGrayscaleFadeDurationMs)));
 
-   std::vector<ui::LayerAnimationSequence*> animations;
-   animations.push_back(brightness_sequence.release());
-   animations.push_back(grayscale_sequence.release());
-   window->layer()->GetAnimator()->ScheduleTogether(animations);
-   if (!show) {
-     window->layer()->SetOpacity(kWindowAnimation_HideOpacity);
-     window->layer()->SetVisible(false);
-   }
+  std::vector<ui::LayerAnimationSequence*> animations;
+  animations.push_back(brightness_sequence.release());
+  animations.push_back(grayscale_sequence.release());
+  window->layer()->GetAnimator()->ScheduleTogether(animations);
+  if (!show) {
+    window->layer()->SetOpacity(kWindowAnimation_HideOpacity);
+    window->layer()->SetVisible(false);
+  }
 }
 
 void AnimateShowWindow_BrightnessGrayscale(aura::Window* window) {
   AnimateShowHideWindowCommon_BrightnessGrayscale(window, true);
 }
 
 void AnimateHideWindow_BrightnessGrayscale(aura::Window* window) {
   AnimateShowHideWindowCommon_BrightnessGrayscale(window, false);
 }
 
@@ skipping 97 matching lines @@
       : window_(window),
         layer_(layer) {
     window_->AddObserver(this);
     layer_->GetCompositor()->AddObserver(this);
   }
   virtual ~CrossFadeObserver() {
     Cleanup();
   }
 
   // ui::CompositorObserver overrides:
-  virtual void OnCompositingDidCommit(ui::Compositor* compositor) OVERRIDE {
-  }
-  virtual void OnCompositingWillStart(ui::Compositor* compositor) OVERRIDE {
-  }
   virtual void OnCompositingStarted(ui::Compositor* compositor) OVERRIDE {
   }
   virtual void OnCompositingEnded(ui::Compositor* compositor) OVERRIDE {
   }
   virtual void OnCompositingAborted(ui::Compositor* compositor) OVERRIDE {
     // Something went wrong with compositing and our layers are now invalid.
     if (layer_)
       layer_->GetAnimator()->StopAnimating();
     // Delete is scheduled in OnImplicitAnimationsCompleted().
     Cleanup();
@@ skipping 195 matching lines @@
         AnimateHideWindow(window);
   }
 }
 
 void SetDelayedOldLayerDeletionInCrossFadeForTest(bool value) {
   delayed_old_layer_deletion_in_cross_fade_for_test_ = value;
 }
 
 }  // namespace internal
 }  // namespace ash