| 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/web_contents/web_contents_view_aura.h" | 5 #include "content/browser/web_contents/web_contents_view_aura.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "base/test/test_timeouts.h" | 10 #include "base/test/test_timeouts.h" |
| (...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 207 state_ = state; | 207 state_ = state; |
| 208 quit_.Run(); | 208 quit_.Run(); |
| 209 } | 209 } |
| 210 } | 210 } |
| 211 | 211 |
| 212 // BrowserMessageFilter: | 212 // BrowserMessageFilter: |
| 213 bool OnMessageReceived(const IPC::Message& message) override { | 213 bool OnMessageReceived(const IPC::Message& message) override { |
| 214 if (message.type() == InputHostMsg_HandleInputEvent_ACK::ID) { | 214 if (message.type() == InputHostMsg_HandleInputEvent_ACK::ID) { |
| 215 InputHostMsg_HandleInputEvent_ACK::Param params; | 215 InputHostMsg_HandleInputEvent_ACK::Param params; |
| 216 InputHostMsg_HandleInputEvent_ACK::Read(&message, ¶ms); | 216 InputHostMsg_HandleInputEvent_ACK::Read(&message, ¶ms); |
| 217 blink::WebInputEvent::Type type = params.a.type; | 217 blink::WebInputEvent::Type type = get<0>(params).type; |
| 218 InputEventAckState ack = params.a.state; | 218 InputEventAckState ack = get<0>(params).state; |
| 219 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, | 219 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, |
| 220 base::Bind(&InputEventMessageFilterWaitsForAcks::ReceivedEventAck, | 220 base::Bind(&InputEventMessageFilterWaitsForAcks::ReceivedEventAck, |
| 221 this, type, ack)); | 221 this, type, ack)); |
| 222 } | 222 } |
| 223 return false; | 223 return false; |
| 224 } | 224 } |
| 225 | 225 |
| 226 base::Closure quit_; | 226 base::Closure quit_; |
| 227 blink::WebInputEvent::Type type_; | 227 blink::WebInputEvent::Type type_; |
| 228 InputEventAckState state_; | 228 InputEventAckState state_; |
| (...skipping 916 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1145 details = dispatcher->OnEventFromSource(&release); | 1145 details = dispatcher->OnEventFromSource(&release); |
| 1146 ASSERT_FALSE(details.dispatcher_destroyed); | 1146 ASSERT_FALSE(details.dispatcher_destroyed); |
| 1147 WaitAFrame(); | 1147 WaitAFrame(); |
| 1148 | 1148 |
| 1149 EXPECT_LT(0, tracker.num_overscroll_updates()); | 1149 EXPECT_LT(0, tracker.num_overscroll_updates()); |
| 1150 EXPECT_FALSE(tracker.overscroll_completed()); | 1150 EXPECT_FALSE(tracker.overscroll_completed()); |
| 1151 } | 1151 } |
| 1152 } | 1152 } |
| 1153 | 1153 |
| 1154 } // namespace content | 1154 } // namespace content |
| OLD | NEW |