| 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 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 171 } | 171 } |
| 172 | 172 |
| 173 InputHandlerProxy::EventDisposition | 173 InputHandlerProxy::EventDisposition |
| 174 InputHandlerProxy::HandleInputEventWithLatencyInfo( | 174 InputHandlerProxy::HandleInputEventWithLatencyInfo( |
| 175 const WebInputEvent& event, | 175 const WebInputEvent& event, |
| 176 ui::LatencyInfo* latency_info) { | 176 ui::LatencyInfo* latency_info) { |
| 177 DCHECK(input_handler_); | 177 DCHECK(input_handler_); |
| 178 | 178 |
| 179 SendScrollLatencyUma(event, *latency_info); | 179 SendScrollLatencyUma(event, *latency_info); |
| 180 | 180 |
| 181 TRACE_EVENT_FLOW_STEP0( | 181 TRACE_EVENT_FLOW_STEP0("input", |
| 182 "input", | 182 "LatencyInfo.Flow", |
| 183 "LatencyInfo.Flow", | 183 TRACE_ID_DONT_MANGLE(latency_info->trace_id), |
| 184 TRACE_ID_DONT_MANGLE(latency_info->trace_id), | 184 "HandleInputEventImpl"); |
| 185 "HanldeInputEventImpl"); | |
| 186 | 185 |
| 187 scoped_ptr<cc::SwapPromiseMonitor> latency_info_swap_promise_monitor = | 186 scoped_ptr<cc::SwapPromiseMonitor> latency_info_swap_promise_monitor = |
| 188 input_handler_->CreateLatencyInfoSwapPromiseMonitor(latency_info); | 187 input_handler_->CreateLatencyInfoSwapPromiseMonitor(latency_info); |
| 189 InputHandlerProxy::EventDisposition disposition = HandleInputEvent(event); | 188 InputHandlerProxy::EventDisposition disposition = HandleInputEvent(event); |
| 190 return disposition; | 189 return disposition; |
| 191 } | 190 } |
| 192 | 191 |
| 193 InputHandlerProxy::EventDisposition InputHandlerProxy::HandleInputEvent( | 192 InputHandlerProxy::EventDisposition InputHandlerProxy::HandleInputEvent( |
| 194 const WebInputEvent& event) { | 193 const WebInputEvent& event) { |
| 195 DCHECK(input_handler_); | 194 DCHECK(input_handler_); |
| (...skipping 607 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 803 // trigger a scroll, e.g., with a trivial time delta between fling updates. | 802 // trigger a scroll, e.g., with a trivial time delta between fling updates. |
| 804 // Return true in this case to prevent early fling termination. | 803 // Return true in this case to prevent early fling termination. |
| 805 if (std::abs(clipped_increment.width) < kScrollEpsilon && | 804 if (std::abs(clipped_increment.width) < kScrollEpsilon && |
| 806 std::abs(clipped_increment.height) < kScrollEpsilon) | 805 std::abs(clipped_increment.height) < kScrollEpsilon) |
| 807 return true; | 806 return true; |
| 808 | 807 |
| 809 return did_scroll; | 808 return did_scroll; |
| 810 } | 809 } |
| 811 | 810 |
| 812 } // namespace content | 811 } // namespace content |
| OLD | NEW |