Add support for calculating the position of the top controls in the cc layer.

cc/top_controls_manager_unittest.cc

Index: cc/top_controls_manager_unittest.cc
diff --git a/cc/top_controls_manager_unittest.cc b/cc/top_controls_manager_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..a92b6ae8f4541be8d049132ccbef7464b1fbfe27
--- /dev/null
+++ b/cc/top_controls_manager_unittest.cc
@@ -0,0 +1,199 @@
+// Copyright 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 "cc/top_controls_manager.h"
+
+#include "base/memory/scoped_ptr.h"
+#include "base/time.h"
+#include "cc/layer_impl.h"
+#include "cc/layer_tree_impl.h"
+#include "cc/test/fake_impl_proxy.h"
+#include "cc/test/fake_layer_tree_host_impl.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gfx/vector2d_f.h"
+
+namespace cc {
+namespace {
+
+class MockTopControlsDelegate : public TopControlsDelegate {
+ public:
+  static const float kTopControlsHeight = 100;
+
+  MockTopControlsDelegate()
+      : host_impl_(&proxy_),
+        redraw_needed_(false),
+        update_draw_properties_needed_(false) {
+    active_tree_ = LayerTreeImpl::create(&host_impl_);
+    root_scroll_layer_ = LayerImpl::create(active_tree_.get(), 1);
+    active_tree_->set_root_scroll_layer(root_scroll_layer_.get());
+  }
+
+  virtual void setNeedsRedraw() OVERRIDE {
+    redraw_needed_ = true;
+  }
+
+  virtual void setNeedsUpdateDrawProperties() OVERRIDE {
+    update_draw_properties_needed_ = true;
+  }
+
+  virtual LayerTreeImpl* activeTree() OVERRIDE {
+    return active_tree_.get();
+  }
+
+  TopControlsManager* manager() {
+    if (!manager_)
+      manager_ = TopControlsManager::create(this, true, kTopControlsHeight);
+    return manager_.get();
+  }
+
+  LayerImpl* rootScrollLayer() {
+    return root_scroll_layer_.get();
+  }
+
+ private:
+  FakeImplProxy proxy_;
+  FakeLayerTreeHostImpl host_impl_;
+  scoped_ptr<LayerTreeImpl> active_tree_;
+  scoped_ptr<LayerImpl> root_scroll_layer_;
+  scoped_ptr<TopControlsManager> manager_;
+  bool redraw_needed_;
+  bool update_draw_properties_needed_;
+};
+
+TEST(TopControlsManagerTest, overlayModeDetection) {
+  MockTopControlsDelegate delegate;
+  TopControlsManager* manager = delegate.manager();
+  delegate.rootScrollLayer()->setScrollDelta(gfx::Vector2dF(0.f, 0.f));
+
+  gfx::Vector2dF remainingScroll = manager->scrollBy(gfx::Vector2dF(0.f, 30.f));
+  ASSERT_EQ(0.f, remainingScroll.y());

[aelias_OOO_until_Jul13, 2012/12/19 08:31:18]

Use EXPECT_ instead of ASSERT_ all through these tests.  ASSERT causes fatal
errors that prevent the rest of the test from running.

[Ted C, 2012/12/19 21:34:17]

Done.

+  ASSERT_EQ(-30.f, manager->controls_top_offset());
+  ASSERT_EQ(70.f, manager->content_top_offset());
+  ASSERT_FALSE(manager->is_overlay_mode());
+  delegate.rootScrollLayer()->setScrollDelta(
+      delegate.rootScrollLayer()->scrollDelta() + remainingScroll);
+
+  remainingScroll = manager->scrollBy(gfx::Vector2dF(0.f, 69.f));
+  ASSERT_EQ(0.f, remainingScroll.y());
+  ASSERT_EQ(-99.f, manager->controls_top_offset());
+  ASSERT_EQ(1.f, manager->content_top_offset());
+  ASSERT_FALSE(manager->is_overlay_mode());
+  delegate.rootScrollLayer()->setScrollDelta(
+      delegate.rootScrollLayer()->scrollDelta() + remainingScroll);
+
+  remainingScroll = manager->scrollBy(gfx::Vector2dF(0.f, -20.f));
+  ASSERT_EQ(0.f, remainingScroll.y());
+  ASSERT_EQ(-79.f, manager->controls_top_offset());
+  ASSERT_EQ(21.f, manager->content_top_offset());
+  ASSERT_FALSE(manager->is_overlay_mode());
+  delegate.rootScrollLayer()->setScrollDelta(
+      delegate.rootScrollLayer()->scrollDelta() + remainingScroll);
+
+  // Scroll to the toggle point
+  remainingScroll = manager->scrollBy(gfx::Vector2dF(0.f, 21.f));
+  ASSERT_EQ(0.f, remainingScroll.y());
+  ASSERT_EQ(-100.f, manager->controls_top_offset());
+  ASSERT_EQ(0.f, manager->content_top_offset());
+  ASSERT_FALSE(manager->is_overlay_mode());
+  delegate.rootScrollLayer()->setScrollDelta(
+      delegate.rootScrollLayer()->scrollDelta() + remainingScroll);
+
+  remainingScroll = manager->scrollBy(gfx::Vector2dF(0.f, 1.f));
+  ASSERT_EQ(1.f, remainingScroll.y());
+  ASSERT_EQ(-100.f, manager->controls_top_offset());
+  ASSERT_EQ(0.f, manager->content_top_offset());
+  ASSERT_TRUE(manager->is_overlay_mode());
+  delegate.rootScrollLayer()->setScrollDelta(
+      delegate.rootScrollLayer()->scrollDelta() + remainingScroll);
+
+  remainingScroll = manager->scrollBy(gfx::Vector2dF(0.f, -1.f));
+  ASSERT_EQ(-1.f, remainingScroll.y());
+  ASSERT_EQ(-99.f, manager->controls_top_offset());
+  ASSERT_EQ(0.f, manager->content_top_offset());
+  ASSERT_TRUE(manager->is_overlay_mode());
+  delegate.rootScrollLayer()->setScrollDelta(
+      delegate.rootScrollLayer()->scrollDelta() + remainingScroll);
+
+  remainingScroll = manager->scrollBy(gfx::Vector2dF(0.f, -50.f));
+  ASSERT_EQ(-50.f, remainingScroll.y());
+  ASSERT_EQ(-49.f, manager->controls_top_offset());
+  ASSERT_EQ(50.f, manager->content_top_offset());
+  ASSERT_FALSE(manager->is_overlay_mode());
+  delegate.rootScrollLayer()->setScrollDelta(
+      delegate.rootScrollLayer()->scrollDelta() + remainingScroll);
+
+  remainingScroll = manager->scrollBy(gfx::Vector2dF(0.f, -50.f));
+  ASSERT_EQ(0.f, manager->controls_top_offset());
+  ASSERT_EQ(100.f, manager->content_top_offset());
+  ASSERT_FALSE(manager->is_overlay_mode());
+  delegate.rootScrollLayer()->setScrollDelta(
+      delegate.rootScrollLayer()->scrollDelta() + remainingScroll);
+}
+
+TEST(TopControlsManagerTest, partialShownHideAnimation) {
+  MockTopControlsDelegate delegate;
+  TopControlsManager* manager = delegate.manager();
+  delegate.rootScrollLayer()->setScrollOffset(gfx::Vector2d(0, 300));
+  manager->scrollBy(gfx::Vector2dF(0.f, 300.f));
+  ASSERT_EQ(-100.f, manager->controls_top_offset());
+  ASSERT_EQ(0.f, manager->content_top_offset());
+  ASSERT_TRUE(manager->is_overlay_mode());
+
+  delegate.rootScrollLayer()->setScrollOffset(gfx::Vector2d(0, 270));
+  manager->scrollBy(gfx::Vector2dF(0.f, -15.f));
+  ASSERT_EQ(-85.f, manager->controls_top_offset());
+  ASSERT_EQ(0.f, manager->content_top_offset());
+  ASSERT_TRUE(manager->is_overlay_mode());
+
+  manager->scrollEnd();
+  ASSERT_TRUE(manager->animation());
+
+  base::TimeTicks time = base::TimeTicks::Now();
+  float previousOffset = manager->controls_top_offset();
+  while(manager->animation()) {
+    time = base::TimeDelta::FromMicroseconds(100) + time;
+    manager->animate(time);
+    ASSERT_LT(manager->controls_top_offset(), previousOffset);
+    previousOffset = manager->controls_top_offset();
+  }
+  ASSERT_FALSE(manager->animation());
+  ASSERT_EQ(-100.f, manager->controls_top_offset());
+  ASSERT_EQ(0.f, manager->content_top_offset());
+  ASSERT_TRUE(manager->is_overlay_mode());
+}
+
+TEST(TopControlsManagerTest, partialShownShowAnimation) {
+  MockTopControlsDelegate delegate;
+  TopControlsManager* manager = delegate.manager();
+  delegate.rootScrollLayer()->setScrollOffset(gfx::Vector2d(0, 300));
+  manager->scrollBy(gfx::Vector2dF(0.f, 300.f));
+  ASSERT_EQ(-100.f, manager->controls_top_offset());
+  ASSERT_EQ(0.f, manager->content_top_offset());
+  ASSERT_TRUE(manager->is_overlay_mode());
+
+  delegate.rootScrollLayer()->setScrollOffset(gfx::Vector2d(0, 230));
+  manager->scrollBy(gfx::Vector2dF(0.f, -70.f));
+  ASSERT_EQ(-30.f, manager->controls_top_offset());
+  ASSERT_EQ(0.f, manager->content_top_offset());
+  ASSERT_TRUE(manager->is_overlay_mode());
+
+  manager->scrollEnd();
+  ASSERT_TRUE(manager->animation());
+
+  base::TimeTicks time = base::TimeTicks::Now();
+  float previousOffset = manager->controls_top_offset();
+  while(manager->animation()) {
+    time = base::TimeDelta::FromMicroseconds(100) + time;
+    manager->animate(time);
+    ASSERT_GT(manager->controls_top_offset(), previousOffset);
+    previousOffset = manager->controls_top_offset();
+  }
+  ASSERT_FALSE(manager->animation());
+  ASSERT_EQ(0.f, manager->controls_top_offset());
+  ASSERT_EQ(0.f, manager->content_top_offset());
+  ASSERT_TRUE(manager->is_overlay_mode());
+}
+
+}  // namespace
+}  // namespace cc