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 "base/auto_reset.h" | 5 #include "base/auto_reset.h" |
6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
7 #include "base/run_loop.h" | 7 #include "base/run_loop.h" |
8 #include "content/browser/gpu/compositor_util.h" | 8 #include "content/browser/gpu/compositor_util.h" |
9 #include "content/browser/renderer_host/render_widget_host_impl.h" | 9 #include "content/browser/renderer_host/render_widget_host_impl.h" |
10 #include "content/browser/web_contents/web_contents_impl.h" | 10 #include "content/browser/web_contents/web_contents_impl.h" |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
105 state_ = state; | 105 state_ = state; |
106 quit_.Run(); | 106 quit_.Run(); |
107 } | 107 } |
108 } | 108 } |
109 | 109 |
110 // BrowserMessageFilter: | 110 // BrowserMessageFilter: |
111 bool OnMessageReceived(const IPC::Message& message) override { | 111 bool OnMessageReceived(const IPC::Message& message) override { |
112 if (message.type() == InputHostMsg_HandleInputEvent_ACK::ID) { | 112 if (message.type() == InputHostMsg_HandleInputEvent_ACK::ID) { |
113 InputHostMsg_HandleInputEvent_ACK::Param params; | 113 InputHostMsg_HandleInputEvent_ACK::Param params; |
114 InputHostMsg_HandleInputEvent_ACK::Read(&message, ¶ms); | 114 InputHostMsg_HandleInputEvent_ACK::Read(&message, ¶ms); |
115 WebInputEvent::Type type = params.a.type; | 115 WebInputEvent::Type type = get<0>(params).type; |
116 InputEventAckState ack = params.a.state; | 116 InputEventAckState ack = get<0>(params).state; |
117 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, | 117 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, |
118 base::Bind(&InputEventMessageFilter::ReceivedEventAck, | 118 base::Bind(&InputEventMessageFilter::ReceivedEventAck, |
119 this, type, ack)); | 119 this, type, ack)); |
120 } | 120 } |
121 return false; | 121 return false; |
122 } | 122 } |
123 | 123 |
124 base::Closure quit_; | 124 base::Closure quit_; |
125 WebInputEvent::Type type_; | 125 WebInputEvent::Type type_; |
126 InputEventAckState state_; | 126 InputEventAckState state_; |
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
244 EXPECT_EQ(INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS, | 244 EXPECT_EQ(INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS, |
245 filter()->last_ack_state()); | 245 filter()->last_ack_state()); |
246 | 246 |
247 touch.PressPoint(25, 125); | 247 touch.PressPoint(25, 125); |
248 GetWidgetHost()->ForwardTouchEventWithLatencyInfo(touch, ui::LatencyInfo()); | 248 GetWidgetHost()->ForwardTouchEventWithLatencyInfo(touch, ui::LatencyInfo()); |
249 filter()->WaitForAck(WebInputEvent::TouchStart); | 249 filter()->WaitForAck(WebInputEvent::TouchStart); |
250 EXPECT_EQ(INPUT_EVENT_ACK_STATE_CONSUMED, filter()->last_ack_state()); | 250 EXPECT_EQ(INPUT_EVENT_ACK_STATE_CONSUMED, filter()->last_ack_state()); |
251 } | 251 } |
252 | 252 |
253 } // namespace content | 253 } // namespace content |
OLD | NEW |