Reland r107720 - Enable the new layer animation framework.

views/view.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 VIEWS_VIEW_H_
 #define VIEWS_VIEW_H_
 #pragma once
 
 #include <algorithm>
 #include <map>
@@ skipping 18 matching lines @@
 namespace gfx {
 class Canvas;
 class Insets;
 class Path;
 }
 
 namespace ui {
 struct AccessibleViewState;
 class Compositor;
 class Layer;
+class LayerAnimationSequence;
 class Texture;
 class ThemeProvider;
 class Transform;
 enum TouchStatus;
 }
 
 #if defined(OS_WIN)
 class NativeViewAccessibilityWin;
 #endif
 
 namespace views {
 
 class Background;
 class Border;
 class ContextMenuController;
 class DragController;
 class FocusManager;
 class FocusTraversable;
 class InputMethod;
-class LayerPropertySetter;
 class LayoutManager;
 class ScrollView;
 class TextInputClient;
 class Widget;
 
 namespace internal {
 class NativeWidgetView;
 class RootView;
 }
 
@@ skipping 210 matching lines @@
   void SetTransform(const ui::Transform& transform);
 
   // Sets whether this view paints to a layer. A view paints to a layer if
   // either of the following are true:
   // . the view has a non-identity transform.
   // . SetPaintToLayer(true) has been invoked.
   // View creates the Layer only when it exists in a Widget with a non-NULL
   // Compositor.
   void SetPaintToLayer(bool paint_to_layer);
 
-  // Sets the LayerPropertySetter for this view. A value of NULL resets the
-  // LayerPropertySetter to the default (immediate). Can only be called on a
-  // View that has a layer().
-  void SetLayerPropertySetter(LayerPropertySetter* setter);
-
   const ui::Layer* layer() const { return layer_.get(); }
   ui::Layer* layer() { return layer_.get(); }
 
   // RTL positioning -----------------------------------------------------------
 
   // Methods for accessing the bounds and position of the view, relative to its
   // parent. The position returned is mirrored if the parent view is using a RTL
   // layout.
   //
   // NOTE: in the vast majority of the cases, the mirroring implementation is
@@ skipping 679 matching lines @@
   // the right layer.
   virtual void MoveLayerToParent(ui::Layer* parent_layer,
                                  const gfx::Point& point);
 
   // Called to update the bounds of any child layers within this View's
   // hierarchy when something happens to the hierarchy.
   virtual void UpdateChildLayerBounds(const gfx::Point& offset);
 
   // Overridden from ui::LayerDelegate:
   virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE;
-  virtual void OnLayerAnimationEnded(const ui::Animation* animation) OVERRIDE;
+  virtual void OnLayerAnimationEnded(
+      const ui::LayerAnimationSequence* animation) OVERRIDE;
 
   // Finds the layer that this view paints to (it may belong to an ancestor
   // view), then reorders the immediate children of that layer to match the
   // order of the view tree.
   virtual void ReorderLayers();
 
   // This reorders the immediate children of |*parent_layer| to match the
   // order of the view tree.
   virtual void ReorderChildLayers(ui::Layer* parent_layer);
 
@@ skipping 389 matching lines @@
 
   // Indicates whether or not the gfx::Canvas object passed to View::Paint()
   // is going to be flipped horizontally (using the appropriate transform) on
   // right-to-left locales for this View.
   bool flip_canvas_on_paint_for_rtl_ui_;
 
   // Accelerated painting ------------------------------------------------------
 
   bool paint_to_layer_;
   scoped_ptr<ui::Layer> layer_;
-  scoped_ptr<LayerPropertySetter> layer_property_setter_;
 
   // Accelerators --------------------------------------------------------------
 
   // true if when we were added to hierarchy we were without focus manager
   // attempt addition when ancestor chain changed.
   bool accelerator_registration_delayed_;
 
   // Focus manager accelerators registered on.
   FocusManager* accelerator_focus_manager_;
 
@@ skipping 33 matching lines @@
 #if defined(OS_WIN)
   scoped_refptr<NativeViewAccessibilityWin> native_view_accessibility_win_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(View);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_VIEW_H_