Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(136)

Unified Diff: ui/events/blink/input_scroll_elasticity_controller_unittest.cc

Issue 2194833002: Overscroll and Elasticity for views::ScrollView Base URL: https://chromium.googlesource.com/chromium/src.git@20160728-MacViews-RouteThroughInputHandler
Patch Set: Restore functionality and fix bugs \o/ Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/events/blink/input_scroll_elasticity_controller.cc ('k') | ui/views/examples/scroll_view_example.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/blink/input_scroll_elasticity_controller_unittest.cc
diff --git a/ui/events/blink/input_scroll_elasticity_controller_unittest.cc b/ui/events/blink/input_scroll_elasticity_controller_unittest.cc
index 18dc76064f710caadb2424a588e9f39fb72696ab..0b8355a84c17f4c008ccfcc05d59a7a3a6f5916e 100644
--- a/ui/events/blink/input_scroll_elasticity_controller_unittest.cc
+++ b/ui/events/blink/input_scroll_elasticity_controller_unittest.cc
@@ -53,6 +53,10 @@ class MockScrollElasticityHelper : public cc::ScrollElasticityHelper {
}
void RequestOneBeginFrame() override { request_begin_frame_count_ += 1; }
+ base::WeakPtr<ScrollElasticityHelper> GetWeakPtr() override {
+ return nullptr;
+ }
+
// Counters for number of times functions were called.
int request_begin_frame_count() const { return request_begin_frame_count_; }
int set_stretch_amount_count() const { return set_stretch_amount_count_; }
@@ -80,8 +84,7 @@ class MockScrollElasticityHelper : public cc::ScrollElasticityHelper {
class ScrollElasticityControllerTest : public testing::Test {
public:
ScrollElasticityControllerTest()
- : controller_(&helper_),
- input_event_count_(0),
+ : input_event_count_(0),
current_time_(base::TimeTicks::FromInternalValue(100000000ull)) {}
~ScrollElasticityControllerTest() override {}
« no previous file with comments | « ui/events/blink/input_scroll_elasticity_controller.cc ('k') | ui/views/examples/scroll_view_example.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698