Chromium Code Reviews| Index: remoting/client/plugin/pepper_input_handler.cc |
| diff --git a/remoting/client/plugin/pepper_input_handler.cc b/remoting/client/plugin/pepper_input_handler.cc |
| index 1b67ba25d974f3aecce41543df68d626781675b7..1204d5499d82127fbeb5b63e359522fce164de62 100644 |
| --- a/remoting/client/plugin/pepper_input_handler.cc |
| +++ b/remoting/client/plugin/pepper_input_handler.cc |
| @@ -35,7 +35,8 @@ uint32_t GetUsbKeyCode(pp::KeyboardInputEvent pp_key_event) { |
| return key_event_interface->GetUsbKeyCode(pp_key_event.pp_resource()); |
| } |
| -bool PepperInputHandler::HandleInputEvent(const pp::InputEvent& event) { |
| +bool PepperInputHandler::HandleInputEvent(const pp::InputEvent& event, |
| + bool mouse_locked) { |
| switch (event.GetType()) { |
| case PP_INPUTEVENT_TYPE_CONTEXTMENU: { |
| // We need to return true here or else we'll get a local (plugin) context |
| @@ -98,6 +99,11 @@ bool PepperInputHandler::HandleInputEvent(const pp::InputEvent& event) { |
| protocol::MouseEvent mouse_event; |
| mouse_event.set_x(pp_mouse_event.GetPosition().x()); |
| mouse_event.set_y(pp_mouse_event.GetPosition().y()); |
| + if (mouse_locked) { |
| + pp::Point delta = pp_mouse_event.GetMovement(); |
| + mouse_event.set_delta_x(delta.x()); |
| + mouse_event.set_delta_y(delta.y()); |
| + } |
| input_stub_->InjectMouseEvent(mouse_event); |
| return true; |
| } |
| @@ -105,7 +111,7 @@ bool PepperInputHandler::HandleInputEvent(const pp::InputEvent& event) { |
| case PP_INPUTEVENT_TYPE_WHEEL: { |
| pp::WheelInputEvent pp_wheel_event(event); |
| - // Don't handle scroll-by-page events, for now. |
| + // Don't handle scroll-by-page events, for now..\admin2 |
|
Wez
2013/09/05 20:24:45
Ctrl+V fail ;)
alexeypa (please no reviews)
2013/09/06 20:00:17
At least it wasn't the password. :-)
|
| if (pp_wheel_event.GetScrollByPage()) |
| return false; |