Issue 245137: Mouse-move events not sent after clicking on drop-down toolbar

remoting/client/plugin/pepper_input_handler.cc

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 847fe16defa672699f556099dd0f17b180a851e0..0bb1262c81ae54ff1bc9a40b2aebddfbbc36f2e5 100644
--- a/remoting/client/plugin/pepper_input_handler.cc
+++ b/remoting/client/plugin/pepper_input_handler.cc
@@ -15,7 +15,6 @@ namespace remoting {
 
 PepperInputHandler::PepperInputHandler(protocol::InputStub* input_stub)
     : input_stub_(input_stub),
-      has_focus_(false),
       wheel_delta_x_(0),
       wheel_delta_y_(0) {
 }
@@ -34,10 +33,6 @@ uint32_t GetUsbKeyCode(pp::KeyboardInputEvent pp_key_event) {
   return key_event_interface->GetUsbKeyCode(pp_key_event.pp_resource());
 }
 
-void PepperInputHandler::OnFocusChanged(bool has_focus) {
-  has_focus_ = has_focus;
-}
-
 bool PepperInputHandler::HandleInputEvent(const pp::InputEvent& event) {
   switch (event.GetType()) {
     case PP_INPUTEVENT_TYPE_CONTEXTMENU: {
@@ -86,45 +81,37 @@ bool PepperInputHandler::HandleInputEvent(const pp::InputEvent& event) {
     case PP_INPUTEVENT_TYPE_MOUSEMOVE:
     case PP_INPUTEVENT_TYPE_MOUSEENTER:
     case PP_INPUTEVENT_TYPE_MOUSELEAVE: {
-      // Don't pass these mouse events through when the
-      // client doesn't have focus.
-      if (has_focus_) {
-        pp::MouseInputEvent pp_mouse_event(event);
-        protocol::MouseEvent mouse_event;
-        mouse_event.set_x(pp_mouse_event.GetPosition().x());
-        mouse_event.set_y(pp_mouse_event.GetPosition().y());
-        input_stub_->InjectMouseEvent(mouse_event);
-      }
+      pp::MouseInputEvent pp_mouse_event(event);
+      protocol::MouseEvent mouse_event;
+      mouse_event.set_x(pp_mouse_event.GetPosition().x());
+      mouse_event.set_y(pp_mouse_event.GetPosition().y());
+      input_stub_->InjectMouseEvent(mouse_event);
       return true;
     }
 
     case PP_INPUTEVENT_TYPE_WHEEL: {
-      // Don't pass wheel events through when the
-      // client doesn't have focus.
-      if (has_focus_) {
-        pp::WheelInputEvent pp_wheel_event(event);
-
-        // Don't handle scroll-by-page events, for now.
-        if (pp_wheel_event.GetScrollByPage())
-          return false;
-
-        // Add this event to our accumulated sub-pixel deltas.
-        pp::FloatPoint delta = pp_wheel_event.GetDelta();
-        wheel_delta_x_ += delta.x();
-        wheel_delta_y_ += delta.y();
-
-        // If there is at least a pixel's movement, emit an event.
-        int delta_x = static_cast<int>(wheel_delta_x_);
-        int delta_y = static_cast<int>(wheel_delta_y_);
-        if (delta_x != 0 || delta_y != 0) {
-          wheel_delta_x_ -= delta_x;
-          wheel_delta_y_ -= delta_y;
-          protocol::MouseEvent mouse_event;
-          mouse_event.set_wheel_delta_x(delta_x);
-          mouse_event.set_wheel_delta_y(delta_y);
-
-          input_stub_->InjectMouseEvent(mouse_event);
-        }
+      pp::WheelInputEvent pp_wheel_event(event);
+
+      // Don't handle scroll-by-page events, for now.
+      if (pp_wheel_event.GetScrollByPage())
+        return false;
+
+      // Add this event to our accumulated sub-pixel deltas.
+      pp::FloatPoint delta = pp_wheel_event.GetDelta();
+      wheel_delta_x_ += delta.x();
+      wheel_delta_y_ += delta.y();
+
+      // If there is at least a pixel's movement, emit an event.
+      int delta_x = static_cast<int>(wheel_delta_x_);
+      int delta_y = static_cast<int>(wheel_delta_y_);
+      if (delta_x != 0 || delta_y != 0) {
+        wheel_delta_x_ -= delta_x;
+        wheel_delta_y_ -= delta_y;
+        protocol::MouseEvent mouse_event;
+        mouse_event.set_wheel_delta_x(delta_x);
+        mouse_event.set_wheel_delta_y(delta_y);
+
+        input_stub_->InjectMouseEvent(mouse_event);
       }
       return true;
     }