OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/render_widget.h" | 5 #include "content/renderer/render_widget.h" |
6 | 6 |
7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 1211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1222 | 1222 |
1223 // Note that we can't use handling_event_type_ here since it will be overriden | 1223 // Note that we can't use handling_event_type_ here since it will be overriden |
1224 // by reentrant calls for events after the paused one. | 1224 // by reentrant calls for events after the paused one. |
1225 bool no_ack = ignore_ack_for_mouse_move_from_debugger_ && | 1225 bool no_ack = ignore_ack_for_mouse_move_from_debugger_ && |
1226 input_event->type == WebInputEvent::MouseMove; | 1226 input_event->type == WebInputEvent::MouseMove; |
1227 if (!WebInputEventTraits::IgnoresAckDisposition(*input_event) && !no_ack) { | 1227 if (!WebInputEventTraits::IgnoresAckDisposition(*input_event) && !no_ack) { |
1228 InputHostMsg_HandleInputEvent_ACK_Params ack; | 1228 InputHostMsg_HandleInputEvent_ACK_Params ack; |
1229 ack.type = input_event->type; | 1229 ack.type = input_event->type; |
1230 ack.state = ack_result; | 1230 ack.state = ack_result; |
1231 ack.latency = swap_latency_info; | 1231 ack.latency = swap_latency_info; |
| 1232 if (WebInputEvent::isTouchEventType(ack.type)) { |
| 1233 const blink::WebTouchEvent& touch = |
| 1234 static_cast<const blink::WebTouchEvent&>(*input_event); |
| 1235 DCHECK_NE(touch.uniqueTouchEventId, 0UL); |
| 1236 ack.unique_touch_event_id = touch.uniqueTouchEventId; |
| 1237 } |
1232 scoped_ptr<IPC::Message> response( | 1238 scoped_ptr<IPC::Message> response( |
1233 new InputHostMsg_HandleInputEvent_ACK(routing_id_, ack)); | 1239 new InputHostMsg_HandleInputEvent_ACK(routing_id_, ack)); |
1234 if (rate_limiting_wanted && frame_pending && !is_hidden_) { | 1240 if (rate_limiting_wanted && frame_pending && !is_hidden_) { |
1235 // We want to rate limit the input events in this case, so we'll wait for | 1241 // We want to rate limit the input events in this case, so we'll wait for |
1236 // painting to finish before ACKing this message. | 1242 // painting to finish before ACKing this message. |
1237 TRACE_EVENT_INSTANT0("renderer", | 1243 TRACE_EVENT_INSTANT0("renderer", |
1238 "RenderWidget::OnHandleInputEvent ack throttled", | 1244 "RenderWidget::OnHandleInputEvent ack throttled", |
1239 TRACE_EVENT_SCOPE_THREAD); | 1245 TRACE_EVENT_SCOPE_THREAD); |
1240 if (pending_input_event_ack_) { | 1246 if (pending_input_event_ack_) { |
1241 TRACE_EVENT_ASYNC_END0("input", "RenderWidget::ThrottledInputEventAck", | 1247 TRACE_EVENT_ASYNC_END0("input", "RenderWidget::ThrottledInputEventAck", |
(...skipping 1181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2423 void RenderWidget::RegisterVideoHoleFrame(RenderFrameImpl* frame) { | 2429 void RenderWidget::RegisterVideoHoleFrame(RenderFrameImpl* frame) { |
2424 video_hole_frames_.AddObserver(frame); | 2430 video_hole_frames_.AddObserver(frame); |
2425 } | 2431 } |
2426 | 2432 |
2427 void RenderWidget::UnregisterVideoHoleFrame(RenderFrameImpl* frame) { | 2433 void RenderWidget::UnregisterVideoHoleFrame(RenderFrameImpl* frame) { |
2428 video_hole_frames_.RemoveObserver(frame); | 2434 video_hole_frames_.RemoveObserver(frame); |
2429 } | 2435 } |
2430 #endif // defined(VIDEO_HOLE) | 2436 #endif // defined(VIDEO_HOLE) |
2431 | 2437 |
2432 } // namespace content | 2438 } // namespace content |
OLD | NEW |