Reland r107720 - Enable the new layer animation framework.

chrome/browser/ui/touch/animation/screen_rotation.h

 // Copyright (c) 2011 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 CHROME_BROWSER_UI_TOUCH_ANIMATION_SCREEN_ROTATION_H_
 #define CHROME_BROWSER_UI_TOUCH_ANIMATION_SCREEN_ROTATION_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/bind.h"
 #include "ui/base/animation/animation_delegate.h"
 #include "ui/gfx/compositor/compositor_observer.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/size.h"
 
 namespace ui {
 class InterpolatedTransform;
 class Layer;
+class LayerAnimationDelegate;
 class SlideAnimation;
 class Transform;
 }
 
 namespace gfx {
 class Rect;
 }
 
 namespace views {
 class PaintLock;
@@ skipping 14 matching lines @@
 // A screen rotation represents a single transition from one screen orientation
 // to another. The  intended usage is that a new instance of the class is
 // created for every transition. It is possible to update the target orientation
 // in the middle of a transition.
 class ScreenRotation : public ui::AnimationDelegate,
                        public ui::CompositorObserver {
  public:
   // The screen rotation does not own the view or the listener, and these
   // objects are required to outlive the Screen rotation object.
   ScreenRotation(views::View* view,
+                 ui::LayerAnimationDelegate* delegate,
                  ScreenRotationListener* listener,
                  float old_degrees,
                  float new_degrees);
   virtual ~ScreenRotation();
 
   // Aborts the animation by skipping to the end and applying the final
   // transform before calling |Finalize|.
   void Stop();
 
  private:
@@ skipping 21 matching lines @@
   // We occasionally need to wait for a paint to finish before progressing.
   // This function (which is triggered by OnPainted and OnComposited) does
   // any pending work.
   void DoPendingWork();
 
   // This is the view that will be animated. The animation will operate mainly
   // on |view_|'s layer, but it is used upon completion of the rotation to
   // update the bounds.
   views::View* view_;
 
+  // This is the delegate that will be modified during the rotation. It is
+  // important not to modify the rotation directly, otherwise we will cause
+  // other, implicit animations.
+  ui::LayerAnimationDelegate* delegate_;
+
   // This widget will be used for scheduling paints.
   views::Widget* widget_;
 
   // A ScreenRotation may be associated with a listener that is notified when
   // the screen rotation completes.
   ScreenRotationListener* listener_;
 
   // The animation object that instigates stepping of the animation.
   scoped_ptr<ui::SlideAnimation> animation_;
 
@@ skipping 20 matching lines @@
   int duration_;
 
   // These are used by DoPendingWork to decide what needs to be done.
   bool animation_started_;
   bool animation_stopped_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenRotation);
 };
 
 #endif  // CHROME_BROWSER_UI_TOUCH_ANIMATION_SCREEN_ROTATION_H_