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

Side by Side Diff: content/renderer/input/input_handler_proxy_unittest.cc

Issue 713413002: Hook ScrollElasticityController to InputHandlerProxy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add missed files Created 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/input/input_handler_proxy.h" 5 #include "content/renderer/input/input_handler_proxy.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "cc/base/swap_promise_monitor.h" 9 #include "cc/base/swap_promise_monitor.h"
10 #include "content/common/input/did_overscroll_params.h" 10 #include "content/common/input/did_overscroll_params.h"
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 bool(const gfx::Point& viewport_point, 97 bool(const gfx::Point& viewport_point,
98 cc::ScrollDirection direction)); 98 cc::ScrollDirection direction));
99 MOCK_METHOD0(ScrollEnd, void()); 99 MOCK_METHOD0(ScrollEnd, void());
100 MOCK_METHOD0(FlingScrollBegin, cc::InputHandler::ScrollStatus()); 100 MOCK_METHOD0(FlingScrollBegin, cc::InputHandler::ScrollStatus());
101 101
102 virtual scoped_ptr<cc::SwapPromiseMonitor> 102 virtual scoped_ptr<cc::SwapPromiseMonitor>
103 CreateLatencyInfoSwapPromiseMonitor(ui::LatencyInfo* latency) override { 103 CreateLatencyInfoSwapPromiseMonitor(ui::LatencyInfo* latency) override {
104 return scoped_ptr<cc::SwapPromiseMonitor>(); 104 return scoped_ptr<cc::SwapPromiseMonitor>();
105 } 105 }
106 106
107 virtual cc::ScrollElasticityControllerClient*
108 GetScrollElasticityControllerClient() {
jdduke (slow) 2014/11/12 02:32:24 Would it be crazy to mock this and add a brief smo
ccameron 2014/11/12 08:15:29 This definitely needs to be done, but I want to cl
109 return NULL;
110 }
111
107 virtual void BindToClient(cc::InputHandlerClient* client) override {} 112 virtual void BindToClient(cc::InputHandlerClient* client) override {}
108 113
109 virtual void MouseMoveAt(const gfx::Point& mouse_position) override {} 114 virtual void MouseMoveAt(const gfx::Point& mouse_position) override {}
110 115
111 MOCK_METHOD2(IsCurrentlyScrollingLayerAt, 116 MOCK_METHOD2(IsCurrentlyScrollingLayerAt,
112 bool(const gfx::Point& point, 117 bool(const gfx::Point& point,
113 cc::InputHandler::ScrollInputType type)); 118 cc::InputHandler::ScrollInputType type));
114 119
115 MOCK_METHOD1(HaveTouchEventHandlersAt, bool(const gfx::Point& point)); 120 MOCK_METHOD1(HaveTouchEventHandlersAt, bool(const gfx::Point& point));
116 121
(...skipping 1944 matching lines...) Expand 10 before | Expand all | Expand 10 after
2061 EXPECT_CALL(mock_input_handler_, SetNeedsAnimate()); 2066 EXPECT_CALL(mock_input_handler_, SetNeedsAnimate());
2062 EXPECT_CALL(mock_client, DidAnimateForInput()); 2067 EXPECT_CALL(mock_client, DidAnimateForInput());
2063 base::TimeTicks time = base::TimeTicks() + base::TimeDelta::FromSeconds(10); 2068 base::TimeTicks time = base::TimeTicks() + base::TimeDelta::FromSeconds(10);
2064 input_handler_->Animate(time); 2069 input_handler_->Animate(time);
2065 2070
2066 testing::Mock::VerifyAndClearExpectations(&mock_client); 2071 testing::Mock::VerifyAndClearExpectations(&mock_client);
2067 } 2072 }
2068 2073
2069 } // namespace 2074 } // namespace
2070 } // namespace content 2075 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698