OLD | NEW |
---|---|
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/auto_reset.h" | 7 #include "base/auto_reset.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
188 InputHandlerProxy::EventDisposition disposition = HandleInputEvent(event); | 188 InputHandlerProxy::EventDisposition disposition = HandleInputEvent(event); |
189 return disposition; | 189 return disposition; |
190 } | 190 } |
191 | 191 |
192 InputHandlerProxy::EventDisposition InputHandlerProxy::HandleInputEvent( | 192 InputHandlerProxy::EventDisposition InputHandlerProxy::HandleInputEvent( |
193 const WebInputEvent& event) { | 193 const WebInputEvent& event) { |
194 DCHECK(input_handler_); | 194 DCHECK(input_handler_); |
195 TRACE_EVENT1("input", "InputHandlerProxy::HandleInputEvent", | 195 TRACE_EVENT1("input", "InputHandlerProxy::HandleInputEvent", |
196 "type", WebInputEventTraits::GetName(event.type)); | 196 "type", WebInputEventTraits::GetName(event.type)); |
197 | 197 |
198 client_->DidReceiveInputEvent(); | |
jdduke (slow)
2014/09/11 16:29:35
This method is called internally for synthetic whe
Sami
2014/09/11 16:42:31
I think we want to have it called for flings too,
alexclarke
2014/09/11 16:45:00
Yes I think we do want to treat synthetic events t
jdduke (slow)
2014/09/11 16:49:11
sgtm.
| |
198 if (FilterInputEventForFlingBoosting(event)) | 199 if (FilterInputEventForFlingBoosting(event)) |
199 return DID_HANDLE; | 200 return DID_HANDLE; |
200 | 201 |
201 if (event.type == WebInputEvent::MouseWheel) { | 202 if (event.type == WebInputEvent::MouseWheel) { |
202 const WebMouseWheelEvent& wheel_event = | 203 const WebMouseWheelEvent& wheel_event = |
203 *static_cast<const WebMouseWheelEvent*>(&event); | 204 *static_cast<const WebMouseWheelEvent*>(&event); |
204 if (wheel_event.scrollByPage) { | 205 if (wheel_event.scrollByPage) { |
205 // TODO(jamesr): We don't properly handle scroll by page in the compositor | 206 // TODO(jamesr): We don't properly handle scroll by page in the compositor |
206 // thread, so punt it to the main thread. http://crbug.com/236639 | 207 // thread, so punt it to the main thread. http://crbug.com/236639 |
207 return DID_NOT_HANDLE; | 208 return DID_NOT_HANDLE; |
(...skipping 600 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
808 // trigger a scroll, e.g., with a trivial time delta between fling updates. | 809 // trigger a scroll, e.g., with a trivial time delta between fling updates. |
809 // Return true in this case to prevent early fling termination. | 810 // Return true in this case to prevent early fling termination. |
810 if (std::abs(clipped_increment.width) < kScrollEpsilon && | 811 if (std::abs(clipped_increment.width) < kScrollEpsilon && |
811 std::abs(clipped_increment.height) < kScrollEpsilon) | 812 std::abs(clipped_increment.height) < kScrollEpsilon) |
812 return true; | 813 return true; |
813 | 814 |
814 return did_scroll; | 815 return did_scroll; |
815 } | 816 } |
816 | 817 |
817 } // namespace content | 818 } // namespace content |
OLD | NEW |