Reland r107720 - Enable the new layer animation framework.

views/view_unittest.cc

 // 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.
 
 #include <map>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/rand_util.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/compositor/compositor.h"
 #include "ui/gfx/compositor/layer.h"
+#include "ui/gfx/compositor/layer_animator.h"
 #include "ui/gfx/compositor/test_compositor.h"
 #include "ui/gfx/compositor/test_texture.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/transform.h"
 #include "views/background.h"
 #include "views/controls/button/button_dropdown.h"
 #include "views/controls/button/checkbox.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/controls/scroll_view.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/events/event.h"
 #include "views/focus/accelerator_handler.h"
 #include "views/focus/view_storage.h"
-#include "views/layer_property_setter.h"
 #include "views/test/views_test_base.h"
 #include "views/touchui/gesture_manager.h"
 #include "views/view.h"
 #include "views/views_delegate.h"
 #include "views/widget/native_widget.h"
 #include "views/widget/root_view.h"
 #include "views/window/dialog_delegate.h"
 
 #if defined(OS_WIN)
 #include "views/test/test_views_delegate.h"
@@ skipping 2395 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Layers
 ////////////////////////////////////////////////////////////////////////////////
 
 #if defined(VIEWS_COMPOSITOR)
 
 namespace {
 
-// Test implementation of LayerPropertySetter;
-class TestLayerPropertySetter : public LayerPropertySetter {
+// Test implementation of LayerAnimator.
+class TestLayerAnimator : public ui::LayerAnimator {
  public:
-  TestLayerPropertySetter();
+  TestLayerAnimator();
 
-  bool installed() const { return installed_; }
   const gfx::Rect& last_bounds() const { return last_bounds_; }
 
-  // LayerPropertySetter:
-  virtual void Installed(ui::Layer* layer) OVERRIDE;
-  virtual void Uninstalled(ui::Layer* layer) OVERRIDE;
-  virtual void SetTransform(ui::Layer* layer,
-                            const ui::Transform& transform) OVERRIDE;
-  virtual void SetBounds(ui::Layer* layer, const gfx::Rect& bounds) OVERRIDE;
+  // LayerAnimator.
+  virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE;
 
  private:
-  bool installed_;
   gfx::Rect last_bounds_;
 
-  DISALLOW_COPY_AND_ASSIGN(TestLayerPropertySetter);
+  DISALLOW_COPY_AND_ASSIGN(TestLayerAnimator);
 };
 
-TestLayerPropertySetter::TestLayerPropertySetter() : installed_(false) {}
-
-void TestLayerPropertySetter::Installed(ui::Layer* layer) {
-  installed_ = true;
+TestLayerAnimator::TestLayerAnimator()
+    : ui::LayerAnimator(base::TimeDelta::FromMilliseconds(0)) {
 }
 
-void TestLayerPropertySetter::Uninstalled(ui::Layer* layer) {
-  installed_ = false;
-}
-
-void TestLayerPropertySetter::SetTransform(ui::Layer* layer,
-                                          const ui::Transform& transform) {
-}
-
-void TestLayerPropertySetter::SetBounds(ui::Layer* layer,
-                                       const gfx::Rect& bounds) {
+void TestLayerAnimator::SetBounds(const gfx::Rect& bounds) {
   last_bounds_ = bounds;
 }
 
 }  // namespace
 
 class ViewLayerTest : public ViewsTestBase {
  public:
   ViewLayerTest() : widget_(NULL), old_use_acceleration_(false) {}
 
   virtual ~ViewLayerTest() {
@@ skipping 174 matching lines @@
   v3->SetPaintToLayer(true);
   v2->AddChildView(v3);
   ASSERT_TRUE(v3->layer() != NULL);
 
   // At this point we have v1-v2-v3. v3 has a layer, v1 and v2 don't.
 
   v1->SetPaintToLayer(true);
   EXPECT_EQ(v1->layer(), v3->layer()->parent());
 }
 
-TEST_F(ViewLayerTest, LayerPropertySetter) {
+TEST_F(ViewLayerTest, LayerAnimator) {
   View* content_view = new View;
   widget()->SetContentsView(content_view);
 
   View* v1 = new View;
   content_view->AddChildView(v1);
   v1->SetPaintToLayer(true);
-  TestLayerPropertySetter* setter = new TestLayerPropertySetter;
-  v1->SetLayerPropertySetter(setter);
-  EXPECT_TRUE(setter->installed());
+  EXPECT_TRUE(v1->layer() != NULL);
 
-  // Turn off the layer, which should trigger uninstall.
-  v1->SetPaintToLayer(false);
-  EXPECT_FALSE(setter->installed());
-
-  v1->SetPaintToLayer(true);
-  EXPECT_TRUE(setter->installed());
+  TestLayerAnimator* animator = new TestLayerAnimator();
+  v1->layer()->SetAnimator(animator);
 
   gfx::Rect bounds(1, 2, 3, 4);
   v1->SetBoundsRect(bounds);
-  EXPECT_EQ(bounds, setter->last_bounds());
-  // TestLayerPropertySetter doesn't update the layer.
+  EXPECT_EQ(bounds, animator->last_bounds());
+  // TestLayerAnimator doesn't update the layer.
   EXPECT_NE(bounds, v1->layer()->bounds());
 }
 
 // Verifies the bounds of a layer are updated if the bounds of ancestor that
 // doesn't have a layer change.
 TEST_F(ViewLayerTest, BoundsChangeWithLayer) {
   View* content_view = new View;
   widget()->SetContentsView(content_view);
 
   View* v1 = new View;
@@ skipping 383 matching lines @@
   ScrambleTree(content);
   EXPECT_TRUE(ViewAndLayerTreeAreConsistent(content, content->layer()));
 
   ScrambleTree(content);
   EXPECT_TRUE(ViewAndLayerTreeAreConsistent(content, content->layer()));
 }
 
 #endif  // VIEWS_COMPOSITOR
 
 }  // namespace views