Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(401)

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_aura_unittest.cc

Issue 2573073003: Collapse the API surface on WebInputEvent via accessor functions. (Closed)
Patch Set: Fix nits Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 661 matching lines...) Expand 10 before | Expand all | Expand 10 after
672 if (!InputMsg_HandleInputEvent::Read( 672 if (!InputMsg_HandleInputEvent::Read(
673 sink_->GetMessageAt(sink_->message_count() - 1), &params)) { 673 sink_->GetMessageAt(sink_->message_count() - 1), &params)) {
674 return; 674 return;
675 } 675 }
676 676
677 InputEventDispatchType dispatch_type = std::get<2>(params); 677 InputEventDispatchType dispatch_type = std::get<2>(params);
678 if (dispatch_type == InputEventDispatchType::DISPATCH_TYPE_NON_BLOCKING) 678 if (dispatch_type == InputEventDispatchType::DISPATCH_TYPE_NON_BLOCKING)
679 return; 679 return;
680 680
681 const blink::WebInputEvent* event = std::get<0>(params); 681 const blink::WebInputEvent* event = std::get<0>(params);
682 SendTouchEventACK(event->type, ack_result, 682 SendTouchEventACK(event->type(), ack_result,
683 WebInputEventTraits::GetUniqueTouchEventId(*event)); 683 WebInputEventTraits::GetUniqueTouchEventId(*event));
684 } 684 }
685 685
686 const ui::MotionEventAura& pointer_state() { 686 const ui::MotionEventAura& pointer_state() {
687 return view_->pointer_state_for_test(); 687 return view_->pointer_state_for_test();
688 } 688 }
689 689
690 protected: 690 protected:
691 BrowserContext* browser_context() { return browser_context_.get(); } 691 BrowserContext* browser_context() { return browser_context_.get(); }
692 692
693 MockRenderWidgetHostDelegate* render_widget_host_delegate() const { 693 MockRenderWidgetHostDelegate* render_widget_host_delegate() const {
(...skipping 1443 matching lines...) Expand 10 before | Expand all | Expand 10 after
2137 switch (msg->type()) { 2137 switch (msg->type()) {
2138 case InputMsg_HandleInputEvent::ID: { 2138 case InputMsg_HandleInputEvent::ID: {
2139 // On some platforms, the call to view_->Show() causes a posted task to 2139 // On some platforms, the call to view_->Show() causes a posted task to
2140 // call 2140 // call
2141 // ui::WindowEventDispatcher::SynthesizeMouseMoveAfterChangeToWindow, 2141 // ui::WindowEventDispatcher::SynthesizeMouseMoveAfterChangeToWindow,
2142 // which the above WaitForCommit may cause to be picked up. Be robust 2142 // which the above WaitForCommit may cause to be picked up. Be robust
2143 // to this extra IPC coming in. 2143 // to this extra IPC coming in.
2144 InputMsg_HandleInputEvent::Param params; 2144 InputMsg_HandleInputEvent::Param params;
2145 InputMsg_HandleInputEvent::Read(msg, &params); 2145 InputMsg_HandleInputEvent::Read(msg, &params);
2146 const blink::WebInputEvent* event = std::get<0>(params); 2146 const blink::WebInputEvent* event = std::get<0>(params);
2147 EXPECT_EQ(blink::WebInputEvent::MouseMove, event->type); 2147 EXPECT_EQ(blink::WebInputEvent::MouseMove, event->type());
2148 break; 2148 break;
2149 } 2149 }
2150 case ViewMsg_ReclaimCompositorResources::ID: 2150 case ViewMsg_ReclaimCompositorResources::ID:
2151 break; 2151 break;
2152 case ViewMsg_Resize::ID: { 2152 case ViewMsg_Resize::ID: {
2153 EXPECT_FALSE(has_resize); 2153 EXPECT_FALSE(has_resize);
2154 ViewMsg_Resize::Param params; 2154 ViewMsg_Resize::Param params;
2155 ViewMsg_Resize::Read(msg, &params); 2155 ViewMsg_Resize::Read(msg, &params);
2156 EXPECT_EQ(size3.ToString(), std::get<0>(params).new_size.ToString()); 2156 EXPECT_EQ(size3.ToString(), std::get<0>(params).new_size.ToString());
2157 has_resize = true; 2157 has_resize = true;
(...skipping 2586 matching lines...) Expand 10 before | Expand all | Expand 10 after
4744 4744
4745 // Retrieve the selected text from clipboard and verify it is as expected. 4745 // Retrieve the selected text from clipboard and verify it is as expected.
4746 base::string16 result_text; 4746 base::string16 result_text;
4747 clipboard->ReadText(ui::CLIPBOARD_TYPE_SELECTION, &result_text); 4747 clipboard->ReadText(ui::CLIPBOARD_TYPE_SELECTION, &result_text);
4748 EXPECT_EQ(expected_text, result_text); 4748 EXPECT_EQ(expected_text, result_text);
4749 } 4749 }
4750 } 4750 }
4751 #endif 4751 #endif
4752 4752
4753 } // namespace content 4753 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698