Expose FS show/hide thresholds to Command Line

cc/top_controls_manager.cc

 // Copyright 2013 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 <algorithm>
 
 #include "base/logging.h"
 #include "base/time.h"
 #include "cc/keyframed_animation_curve.h"
 #include "cc/layer_tree_impl.h"
 #include "cc/timing_function.h"
 #include "cc/top_controls_manager_client.h"
 #include "ui/gfx/transform.h"
 #include "ui/gfx/vector2d_f.h"
 
 namespace cc {
 namespace {
 // These constants were chosen empirically for their visually pleasant behavior.
 // Contact tedchoc@chromium.org for questions about changing these values.
-const float kShowHideThreshold = 0.5f;
 const int64 kShowHideMaxDurationMs = 175;
 }
 
 // static
 scoped_ptr<TopControlsManager> TopControlsManager::Create(
-    TopControlsManagerClient* client, float top_controls_height) {
-  return make_scoped_ptr(new TopControlsManager(client, top_controls_height));
+    TopControlsManagerClient* client,
+    float top_controls_height,
+    float top_controls_show_threshold,
+    float top_controls_hide_threshold) {
+  return make_scoped_ptr(new TopControlsManager(client,
+                                                top_controls_height,
+                                                top_controls_show_threshold,
+                                                top_controls_hide_threshold));
 }
 
 TopControlsManager::TopControlsManager(TopControlsManagerClient* client,
-                                       float top_controls_height)
+                                       float top_controls_height,
+                                       float top_controls_show_threshold,
+                                       float top_controls_hide_threshold)
     : client_(client),
       animation_direction_(NO_ANIMATION),
+      top_controls_show_threshold_(top_controls_show_threshold),
+      top_controls_hide_threshold_(top_controls_hide_threshold),
       is_overlay_mode_(false),
       in_scroll_gesture_(false),
       top_controls_height_(top_controls_height),
       controls_top_offset_(0),
       content_top_offset_(top_controls_height),
       previous_root_scroll_offset_(0.f),
-      scroll_start_offset_(0.f) {
+      scroll_start_offset_(0.f),
+      current_scroll_delta_(0.f) {
   CHECK(client_);
 }
 
 TopControlsManager::~TopControlsManager() {
 }
 
 void TopControlsManager::UpdateDrawPositions() {
   if (!client_->haveRootScrollLayer())
     return;
 
   // If the scroll position has changed underneath us (i.e. a javascript
   // scroll), then simulate a scroll that covers the delta.
   float scroll_total_y = RootScrollLayerTotalScrollY();
   if (!in_scroll_gesture_
       && scroll_total_y != previous_root_scroll_offset_) {
     ScrollBy(gfx::Vector2dF(0, scroll_total_y - previous_root_scroll_offset_));
     StartAnimationIfNecessary();
     previous_root_scroll_offset_ = RootScrollLayerTotalScrollY();
   }
 }
 
 void TopControlsManager::ScrollBegin() {
   ResetAnimations();
   in_scroll_gesture_ = true;
   scroll_start_offset_ = RootScrollLayerTotalScrollY() + controls_top_offset_;
+  current_scroll_delta_ = 0.f;
 }
 
 gfx::Vector2dF TopControlsManager::ScrollBy(
     const gfx::Vector2dF pending_delta) {
   if (pending_delta.y() == 0)
     return pending_delta;
 
+  current_scroll_delta_ += pending_delta.y();
+
   float scroll_total_y = RootScrollLayerTotalScrollY();
   if (in_scroll_gesture_ &&
       ((pending_delta.y() > 0 && scroll_total_y < scroll_start_offset_) ||
        (pending_delta.y() < 0 &&
            scroll_total_y > scroll_start_offset_ + top_controls_height_))) {
     return pending_delta;
   }
 
   ResetAnimations();
   return ScrollInternal(pending_delta);
@@ skipping 44 matching lines @@
     client_->setActiveTreeNeedsUpdateDrawProperties();
   }
 
   return pending_delta - applied_delta;
 }
 
 void TopControlsManager::ScrollEnd() {
   StartAnimationIfNecessary();
   previous_root_scroll_offset_ = RootScrollLayerTotalScrollY();
   in_scroll_gesture_ = false;
+  current_scroll_delta_ = 0.f;
 }
 
 void TopControlsManager::Animate(base::TimeTicks monotonic_time) {
   if (!top_controls_animation_ || !client_->haveRootScrollLayer())
     return;
 
   double time = (monotonic_time - base::TimeTicks()).InMillisecondsF();
   float new_offset = top_controls_animation_->getValue(time);
   gfx::Vector2dF scroll_vector(0.f, -(new_offset - controls_top_offset_));
   ScrollInternal(scroll_vector);
@@ skipping 23 matching lines @@
                             scoped_ptr<TimingFunction>()));
   float max_ending_offset =
       (direction == SHOWING_CONTROLS ? 1 : -1) * top_controls_height_;
   top_controls_animation_->addKeyframe(
       FloatKeyframe::create(start_time + kShowHideMaxDurationMs,
                             controls_top_offset_ + max_ending_offset,
                             EaseTimingFunction::create()));
   animation_direction_ = direction;
 }
 
 void TopControlsManager::StartAnimationIfNecessary() {

[Ted C, 2013/02/07 00:40:26]

Can you add a unittest that verifies the new animation behavior?

[David Trainor- moved to gerrit, 2013/02/11 19:38:28]

Done.

-  float scroll_total_y = RootScrollLayerTotalScrollY();
-
   if (controls_top_offset_ != 0
       && controls_top_offset_ != -top_controls_height_) {
-    AnimationDirection show_controls =
-        controls_top_offset_ >= -(top_controls_height_ * kShowHideThreshold) ?
-            SHOWING_CONTROLS : HIDING_CONTROLS;
-    if (!top_controls_animation_ || animation_direction_ != show_controls) {
+    AnimationDirection show_controls = NO_ANIMATION;
+
+    if (controls_top_offset_ >=
+        -(top_controls_height_ * top_controls_hide_threshold_)) {

[Ted C, 2013/02/07 00:40:26]

Looking at this, should we initialize top_controls_hide_threshold_ to be the
precomputed value of

-(top_controls_height * top_controls_show_threshold)

in the constructor?

[David Trainor- moved to gerrit, 2013/02/11 19:38:28]

Done.

+      // If we're showing so much that the hide threshold won't trigger, show.
+      show_controls = SHOWING_CONTROLS;
+    } else if (controls_top_offset_ <=
+        -(top_controls_height_ * (1.f - top_controls_show_threshold_))) {

[Ted C, 2013/02/07 00:40:26]

same for this?

[David Trainor- moved to gerrit, 2013/02/11 19:38:28]

Done.

+      // If we're showing so little that the show threshold won't trigger, hide.
+      show_controls = HIDING_CONTROLS;
+    } else {
+      // If we could be either showing or hiding, we determine which one to
+      // do based on whether or not the total scroll delta was moving up or
+      // down.
+      show_controls = current_scroll_delta_ <= 0.f ?
+          SHOWING_CONTROLS : HIDING_CONTROLS;
+    }
+
+    if (show_controls != NO_ANIMATION &&
+        (!top_controls_animation_ || animation_direction_ != show_controls)) {
       SetupAnimation(show_controls);
       client_->setNeedsRedraw();
     }
   }
 }
 
 bool TopControlsManager::IsAnimationCompleteAtTime(base::TimeTicks time) {
   if (!top_controls_animation_)
     return true;
 
   double time_ms = (time - base::TimeTicks()).InMillisecondsF();
   float new_offset = top_controls_animation_->getValue(time_ms);
 
   if ((animation_direction_ == SHOWING_CONTROLS && new_offset >= 0) ||
       (animation_direction_ == HIDING_CONTROLS
           && new_offset <= -top_controls_height_)) {
     return true;
   }
   return false;
 }
 
 }  // namespace cc