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

remoting/client/plugin/pepper_input_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/client/plugin/pepper_input_handler.h"
 
 #include "base/logging.h"
 #include "ppapi/c/dev/ppb_keyboard_input_event_dev.h"
 #include "ppapi/cpp/input_event.h"
 #include "ppapi/cpp/module_impl.h"
 #include "ppapi/cpp/point.h"
 #include "remoting/proto/event.pb.h"
 
 namespace remoting {
 
 PepperInputHandler::PepperInputHandler(protocol::InputStub* input_stub)
     : input_stub_(input_stub),
-      has_focus_(false),
       wheel_delta_x_(0),
       wheel_delta_y_(0) {
 }
 
 PepperInputHandler::~PepperInputHandler() {
 }
 
 // Helper function to get the USB key code using the Dev InputEvent interface.
 uint32_t GetUsbKeyCode(pp::KeyboardInputEvent pp_key_event) {
   const PPB_KeyboardInputEvent_Dev* key_event_interface =
       reinterpret_cast<const PPB_KeyboardInputEvent_Dev*>(
           pp::Module::Get()->GetBrowserInterface(
               PPB_KEYBOARD_INPUT_EVENT_DEV_INTERFACE));
   if (!key_event_interface)
     return 0;
   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: {
       // We need to return true here or else we'll get a local (plugin) context
       // menu instead of the mouseup event for the right click.
       return true;
     }
 
     case PP_INPUTEVENT_TYPE_KEYDOWN:
     case PP_INPUTEVENT_TYPE_KEYUP: {
@@ skipping 28 matching lines @@
         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_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);
+      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: {
+      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_x(pp_mouse_event.GetPosition().x());
-        mouse_event.set_y(pp_mouse_event.GetPosition().y());
+        mouse_event.set_wheel_delta_x(delta_x);
+        mouse_event.set_wheel_delta_y(delta_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);
-        }
-      }
-      return true;
-    }
 
     case PP_INPUTEVENT_TYPE_CHAR:
       // Consume but ignore character input events.
       return true;
 
     default: {
       LOG(INFO) << "Unhandled input event: " << event.GetType();
       break;
     }
   }
 
   return false;
 }
 
 }  // namespace remoting