[Android] Isolate OverscrollRefresh from device density

content/browser/android/overscroll_refresh.cc

 // Copyright 2014 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 "content/browser/android/overscroll_refresh.h"
 
 #include "cc/layers/ui_resource_layer.h"
 #include "cc/trees/layer_tree_host.h"
 #include "content/browser/android/animation_utils.h"
 #include "ui/base/android/system_ui_resource_manager.h"
-#include "ui/gfx/screen.h"
 
 using std::abs;
 using std::max;
 using std::min;
 
 namespace content {
 namespace {
 
 const ui::SystemUIResourceType kIdleResourceType = ui::OVERSCROLL_REFRESH_IDLE;
 const ui::SystemUIResourceType kActiveResourceType =
     ui::OVERSCROLL_REFRESH_ACTIVE;
 
-// Default offset in dips from the top of the view to where the progress spinner
-// should stop.
-const int kDefaultSpinnerTargetDips = 64;
-
 // Drag movement multiplier between user input and effect translation.
 const float kDragRate = .5f;
 
 // Animation duration after the effect is released without triggering a refresh.
 const int kRecedeTimeMs = 300;
 
 // Animation duration immediately after the effect is released and activated.
 const int kActivationStartTimeMs = 150;
 
 // Animation duration after the effect is released and triggers a refresh.
@@ skipping 66 matching lines @@
   gfx::Transform transform;
   transform.Translate(offset_x, offset_y);
   transform.Rotate(rotation);
   layer->SetTransform(transform);
 }
 
 }  // namespace
 
 class OverscrollRefresh::Effect {
  public:
-  Effect(ui::SystemUIResourceManager* resource_manager)
+  Effect(ui::SystemUIResourceManager* resource_manager, float target_drag)
       : resource_manager_(resource_manager),
         idle_layer_(cc::UIResourceLayer::Create()),
         active_layer_(cc::UIResourceLayer::Create()),
-        target_drag_(kDefaultSpinnerTargetDips *
-                     gfx::Screen::GetNativeScreen()
-                         ->GetPrimaryDisplay()
-                         .device_scale_factor()),
+        target_drag_(target_drag),
         drag_(0),
         idle_alpha_(0),
         active_alpha_(0),
         offset_(0),
         rotation_(0),
         idle_alpha_start_(0),
         idle_alpha_finish_(0),
         active_alpha_start_(0),
         active_alpha_finish_(0),
         offset_start_(0),
@@ skipping 222 matching lines @@
 
   base::TimeTicks start_time_;
   base::TimeTicks activated_start_time_;
   base::TimeDelta duration_;
 
   State state_;
 };
 
 OverscrollRefresh::OverscrollRefresh(
     ui::SystemUIResourceManager* resource_manager,
-    OverscrollRefreshClient* client)
+    OverscrollRefreshClient* client,
+    float target_drag_offset_pixels)
     : client_(client),
       scrolled_to_top_(true),
       scroll_consumption_state_(DISABLED),
-      effect_(new Effect(resource_manager)) {
+      effect_(new Effect(resource_manager, target_drag_offset_pixels)) {
   DCHECK(client);
 }
 
 OverscrollRefresh::~OverscrollRefresh() {
 }
 
 void OverscrollRefresh::Reset() {
   scroll_consumption_state_ = DISABLED;
   effect_->Finish();
 }
@@ skipping 71 matching lines @@
 
 void OverscrollRefresh::Release(bool allow_activation) {
   if (scroll_consumption_state_ == ENABLED) {
     if (effect_->Release(base::TimeTicks::Now(), allow_activation))
       client_->TriggerRefresh();
   }
   scroll_consumption_state_ = DISABLED;
 }
 
 }  // namespace content