| 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 | 9 |
| 10 #include <tuple> | 10 #include <tuple> |
| (...skipping 599 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 610 if (!InputMsg_HandleInputEvent::Read( | 610 if (!InputMsg_HandleInputEvent::Read( |
| 611 sink_->GetMessageAt(sink_->message_count() - 1), ¶ms)) { | 611 sink_->GetMessageAt(sink_->message_count() - 1), ¶ms)) { |
| 612 return; | 612 return; |
| 613 } | 613 } |
| 614 | 614 |
| 615 InputEventDispatchType dispatch_type = std::get<2>(params); | 615 InputEventDispatchType dispatch_type = std::get<2>(params); |
| 616 if (dispatch_type == InputEventDispatchType::DISPATCH_TYPE_NON_BLOCKING) | 616 if (dispatch_type == InputEventDispatchType::DISPATCH_TYPE_NON_BLOCKING) |
| 617 return; | 617 return; |
| 618 | 618 |
| 619 const blink::WebInputEvent* event = std::get<0>(params); | 619 const blink::WebInputEvent* event = std::get<0>(params); |
| 620 SendTouchEventACK(event->type, ack_result, | 620 SendTouchEventACK(event->type(), ack_result, |
| 621 WebInputEventTraits::GetUniqueTouchEventId(*event)); | 621 WebInputEventTraits::GetUniqueTouchEventId(*event)); |
| 622 } | 622 } |
| 623 | 623 |
| 624 const ui::MotionEventAura& pointer_state() { | 624 const ui::MotionEventAura& pointer_state() { |
| 625 return view_->pointer_state_for_test(); | 625 return view_->pointer_state_for_test(); |
| 626 } | 626 } |
| 627 | 627 |
| 628 protected: | 628 protected: |
| 629 BrowserContext* browser_context() { return browser_context_.get(); } | 629 BrowserContext* browser_context() { return browser_context_.get(); } |
| 630 | 630 |
| 631 MockRenderWidgetHostDelegate* render_widget_host_delegate() const { | 631 MockRenderWidgetHostDelegate* render_widget_host_delegate() const { |
| (...skipping 1436 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2068 switch (msg->type()) { | 2068 switch (msg->type()) { |
| 2069 case InputMsg_HandleInputEvent::ID: { | 2069 case InputMsg_HandleInputEvent::ID: { |
| 2070 // On some platforms, the call to view_->Show() causes a posted task to | 2070 // On some platforms, the call to view_->Show() causes a posted task to |
| 2071 // call | 2071 // call |
| 2072 // ui::WindowEventDispatcher::SynthesizeMouseMoveAfterChangeToWindow, | 2072 // ui::WindowEventDispatcher::SynthesizeMouseMoveAfterChangeToWindow, |
| 2073 // which the above WaitForCommit may cause to be picked up. Be robust | 2073 // which the above WaitForCommit may cause to be picked up. Be robust |
| 2074 // to this extra IPC coming in. | 2074 // to this extra IPC coming in. |
| 2075 InputMsg_HandleInputEvent::Param params; | 2075 InputMsg_HandleInputEvent::Param params; |
| 2076 InputMsg_HandleInputEvent::Read(msg, ¶ms); | 2076 InputMsg_HandleInputEvent::Read(msg, ¶ms); |
| 2077 const blink::WebInputEvent* event = std::get<0>(params); | 2077 const blink::WebInputEvent* event = std::get<0>(params); |
| 2078 EXPECT_EQ(blink::WebInputEvent::MouseMove, event->type); | 2078 EXPECT_EQ(blink::WebInputEvent::MouseMove, event->type()); |
| 2079 break; | 2079 break; |
| 2080 } | 2080 } |
| 2081 case ViewMsg_ReclaimCompositorResources::ID: | 2081 case ViewMsg_ReclaimCompositorResources::ID: |
| 2082 break; | 2082 break; |
| 2083 case ViewMsg_Resize::ID: { | 2083 case ViewMsg_Resize::ID: { |
| 2084 EXPECT_FALSE(has_resize); | 2084 EXPECT_FALSE(has_resize); |
| 2085 ViewMsg_Resize::Param params; | 2085 ViewMsg_Resize::Param params; |
| 2086 ViewMsg_Resize::Read(msg, ¶ms); | 2086 ViewMsg_Resize::Read(msg, ¶ms); |
| 2087 EXPECT_EQ(size3.ToString(), std::get<0>(params).new_size.ToString()); | 2087 EXPECT_EQ(size3.ToString(), std::get<0>(params).new_size.ToString()); |
| 2088 has_resize = true; | 2088 has_resize = true; |
| (...skipping 2587 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4676 | 4676 |
| 4677 // Retrieve the selected text from clipboard and verify it is as expected. | 4677 // Retrieve the selected text from clipboard and verify it is as expected. |
| 4678 base::string16 result_text; | 4678 base::string16 result_text; |
| 4679 clipboard->ReadText(ui::CLIPBOARD_TYPE_SELECTION, &result_text); | 4679 clipboard->ReadText(ui::CLIPBOARD_TYPE_SELECTION, &result_text); |
| 4680 EXPECT_EQ(expected_text, result_text); | 4680 EXPECT_EQ(expected_text, result_text); |
| 4681 } | 4681 } |
| 4682 } | 4682 } |
| 4683 #endif | 4683 #endif |
| 4684 | 4684 |
| 4685 } // namespace content | 4685 } // namespace content |
| OLD | NEW |