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/browser/renderer_host/render_widget_host_view_aura.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 501 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
512 void AckLastSentInputEventIfNecessary(InputEventAckState ack_result) { | 512 void AckLastSentInputEventIfNecessary(InputEventAckState ack_result) { |
513 if (!sink_->message_count()) | 513 if (!sink_->message_count()) |
514 return; | 514 return; |
515 | 515 |
516 InputMsg_HandleInputEvent::Param params; | 516 InputMsg_HandleInputEvent::Param params; |
517 if (!InputMsg_HandleInputEvent::Read( | 517 if (!InputMsg_HandleInputEvent::Read( |
518 sink_->GetMessageAt(sink_->message_count() - 1), ¶ms)) { | 518 sink_->GetMessageAt(sink_->message_count() - 1), ¶ms)) { |
519 return; | 519 return; |
520 } | 520 } |
521 | 521 |
522 if (!WebInputEventTraits::WillReceiveAckFromRenderer( | 522 InputEventDispatchType dispatch_type = base::get<2>(params); |
523 *base::get<0>(params))) | 523 if (dispatch_type == InputEventDispatchType::DISPATCH_TYPE_NON_BLOCKING) |
524 return; | 524 return; |
525 | 525 |
526 const blink::WebInputEvent* event = base::get<0>(params); | 526 const blink::WebInputEvent* event = base::get<0>(params); |
527 SendTouchEventACK(event->type, ack_result, | 527 SendTouchEventACK(event->type, ack_result, |
528 WebInputEventTraits::GetUniqueTouchEventId(*event)); | 528 WebInputEventTraits::GetUniqueTouchEventId(*event)); |
529 } | 529 } |
530 | 530 |
531 const ui::MotionEventAura& pointer_state() { | 531 const ui::MotionEventAura& pointer_state() { |
532 return view_->pointer_state_for_test(); | 532 return view_->pointer_state_for_test(); |
533 } | 533 } |
(...skipping 3935 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4469 view()->OnGestureEvent(&gesture_event); | 4469 view()->OnGestureEvent(&gesture_event); |
4470 | 4470 |
4471 EXPECT_TRUE(delegate->context_menu_request_received()); | 4471 EXPECT_TRUE(delegate->context_menu_request_received()); |
4472 EXPECT_EQ(delegate->context_menu_source_type(), ui::MENU_SOURCE_TOUCH); | 4472 EXPECT_EQ(delegate->context_menu_source_type(), ui::MENU_SOURCE_TOUCH); |
4473 #endif | 4473 #endif |
4474 | 4474 |
4475 RenderViewHostFactory::set_is_real_render_view_host(false); | 4475 RenderViewHostFactory::set_is_real_render_view_host(false); |
4476 } | 4476 } |
4477 | 4477 |
4478 } // namespace content | 4478 } // namespace content |
OLD | NEW |