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

Side by Side Diff: content/browser/renderer_host/input/touch_input_browsertest.cc

Issue 292443004: Remove IPC_BEGIN_MESSAGE_MAP_EX macro since r270839 made all bad IPCs kill their child processes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 6 years, 7 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 | Annotate | Revision Log
OLDNEW
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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 101
102 private: 102 private:
103 void ReceivedEventAck(WebInputEvent::Type type, InputEventAckState state) { 103 void ReceivedEventAck(WebInputEvent::Type type, InputEventAckState state) {
104 if (type_ == type) { 104 if (type_ == type) {
105 state_ = state; 105 state_ = state;
106 quit_.Run(); 106 quit_.Run();
107 } 107 }
108 } 108 }
109 109
110 // BrowserMessageFilter: 110 // BrowserMessageFilter:
111 virtual bool OnMessageReceived(const IPC::Message& message, 111 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE {
112 bool* message_was_ok) OVERRIDE {
113 if (message.type() == InputHostMsg_HandleInputEvent_ACK::ID) { 112 if (message.type() == InputHostMsg_HandleInputEvent_ACK::ID) {
114 InputHostMsg_HandleInputEvent_ACK::Param params; 113 InputHostMsg_HandleInputEvent_ACK::Param params;
115 InputHostMsg_HandleInputEvent_ACK::Read(&message, &params); 114 InputHostMsg_HandleInputEvent_ACK::Read(&message, &params);
116 WebInputEvent::Type type = params.a; 115 WebInputEvent::Type type = params.a;
117 InputEventAckState ack = params.b; 116 InputEventAckState ack = params.b;
118 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, 117 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
119 base::Bind(&InputEventMessageFilter::ReceivedEventAck, 118 base::Bind(&InputEventMessageFilter::ReceivedEventAck,
120 this, type, ack)); 119 this, type, ack));
121 } 120 }
122 return false; 121 return false;
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 EXPECT_EQ(INPUT_EVENT_ACK_STATE_NOT_CONSUMED, filter()->last_ack_state()); 256 EXPECT_EQ(INPUT_EVENT_ACK_STATE_NOT_CONSUMED, filter()->last_ack_state());
258 } 257 }
259 258
260 touch.PressPoint(25, 125); 259 touch.PressPoint(25, 125);
261 GetWidgetHost()->ForwardTouchEventWithLatencyInfo(touch, ui::LatencyInfo()); 260 GetWidgetHost()->ForwardTouchEventWithLatencyInfo(touch, ui::LatencyInfo());
262 filter()->WaitForAck(WebInputEvent::TouchStart); 261 filter()->WaitForAck(WebInputEvent::TouchStart);
263 EXPECT_EQ(INPUT_EVENT_ACK_STATE_CONSUMED, filter()->last_ack_state()); 262 EXPECT_EQ(INPUT_EVENT_ACK_STATE_CONSUMED, filter()->last_ack_state());
264 } 263 }
265 264
266 } // namespace content 265 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698