From 6852d7d96f3643277e8dab49e3bfa0e482aafffe Mon Sep 17 00:00:00 2001 From: "sergeyu@chromium.org" Date: Sat, 22 Jan 2011 02:34:56 +0000 Subject: Changed MessageReader so that it doesn't read from the socket if there are other messages being processed. Added unittests for MessageReader. BUG=None TEST=Unittests Review URL: http://codereview.chromium.org/6271004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72262 0039d316-1c4b-4281-b951-d872f2087c98 --- remoting/protocol/input_sender.cc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'remoting/protocol/input_sender.cc') diff --git a/remoting/protocol/input_sender.cc b/remoting/protocol/input_sender.cc index 8831649..8ba90ca 100644 --- a/remoting/protocol/input_sender.cc +++ b/remoting/protocol/input_sender.cc @@ -9,6 +9,7 @@ #include "base/task.h" #include "remoting/proto/event.pb.h" +#include "remoting/proto/internal.pb.h" #include "remoting/protocol/buffered_socket_writer.h" #include "remoting/protocol/util.h" @@ -27,19 +28,17 @@ InputSender::~InputSender() { void InputSender::InjectKeyEvent(const KeyEvent* event, Task* done) { EventMessage message; - Event* evt = message.add_event(); // TODO(hclam): Provide timestamp. - evt->set_timestamp(0); - evt->mutable_key()->CopyFrom(*event); + message.set_timestamp(0); + message.mutable_key_event()->CopyFrom(*event); buffered_writer_->Write(SerializeAndFrameMessage(message), done); } void InputSender::InjectMouseEvent(const MouseEvent* event, Task* done) { EventMessage message; - Event* evt = message.add_event(); // TODO(hclam): Provide timestamp. - evt->set_timestamp(0); - evt->mutable_mouse()->CopyFrom(*event); + message.set_timestamp(0); + message.mutable_mouse_event()->CopyFrom(*event); buffered_writer_->Write(SerializeAndFrameMessage(message), done); } -- cgit v1.1