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

Side by Side Diff: content/browser/renderer_host/input/mock_input_router_client.cc

Issue 2785533003: Animated scroll shouldn't consume unhandled scrolls for OOPIFs. (Closed)
Patch Set: Rebase to master@{#465268}. Created 3 years, 8 months 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/browser/renderer_host/input/mock_input_router_client.h" 5 #include "content/browser/renderer_host/input/mock_input_router_client.h"
6 6
7 #include "content/browser/renderer_host/input/input_router.h" 7 #include "content/browser/renderer_host/input/input_router.h"
8 #include "content/common/input/input_event.h" 8 #include "content/common/input/input_event.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 10
11 using base::TimeDelta; 11 using base::TimeDelta;
12 using blink::WebGestureEvent; 12 using blink::WebGestureEvent;
13 using blink::WebInputEvent; 13 using blink::WebInputEvent;
14 using blink::WebMouseEvent; 14 using blink::WebMouseEvent;
15 using blink::WebMouseWheelEvent; 15 using blink::WebMouseWheelEvent;
16 using blink::WebTouchEvent; 16 using blink::WebTouchEvent;
17 using blink::WebTouchPoint; 17 using blink::WebTouchPoint;
18 18
19 namespace content { 19 namespace content {
20 20
21 MockInputRouterClient::MockInputRouterClient() 21 MockInputRouterClient::MockInputRouterClient()
22 : input_router_(NULL), 22 : input_router_(NULL),
23 in_flight_event_count_(0), 23 in_flight_event_count_(0),
24 has_touch_handler_(false), 24 has_touch_handler_(false),
25 filter_state_(INPUT_EVENT_ACK_STATE_NOT_CONSUMED), 25 filter_state_(INPUT_EVENT_ACK_STATE_NOT_CONSUMED),
26 filter_input_event_called_(false), 26 filter_input_event_called_(false),
27 did_flush_called_count_(0) { 27 did_flush_called_count_(0) {}
28 }
29 28
30 MockInputRouterClient::~MockInputRouterClient() {} 29 MockInputRouterClient::~MockInputRouterClient() {}
31 30
32 InputEventAckState MockInputRouterClient::FilterInputEvent( 31 InputEventAckState MockInputRouterClient::FilterInputEvent(
33 const WebInputEvent& input_event, 32 const WebInputEvent& input_event,
34 const ui::LatencyInfo& latency_info) { 33 const ui::LatencyInfo& latency_info) {
35 filter_input_event_called_ = true; 34 filter_input_event_called_ = true;
36 last_filter_event_.reset(new InputEvent(input_event, latency_info)); 35 last_filter_event_.reset(new InputEvent(input_event, latency_info));
37 return filter_state_; 36 return filter_state_;
38 } 37 }
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 return did_flush_called_count; 83 return did_flush_called_count;
85 } 84 }
86 85
87 ui::DidOverscrollParams MockInputRouterClient::GetAndResetOverscroll() { 86 ui::DidOverscrollParams MockInputRouterClient::GetAndResetOverscroll() {
88 ui::DidOverscrollParams overscroll; 87 ui::DidOverscrollParams overscroll;
89 std::swap(overscroll_, overscroll); 88 std::swap(overscroll_, overscroll);
90 return overscroll; 89 return overscroll;
91 } 90 }
92 91
93 } // namespace content 92 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698