Enable keyboard filters in PNaCl client

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/cpp/image_data.h"
 #include "ppapi/cpp/input_event.h"
 #include "ppapi/cpp/module_impl.h"
 #include "ppapi/cpp/mouse_cursor.h"
 #include "ppapi/cpp/point.h"
 #include "ppapi/cpp/var.h"
 #include "remoting/proto/event.pb.h"
 #include "ui/events/keycodes/dom4/keycode_converter.h"
 
 namespace remoting {
 
 PepperInputHandler::PepperInputHandler(
-    pp::Instance* instance,
-    protocol::InputStub* input_stub)
+    pp::Instance* instance)
     : pp::MouseLock(instance),
       instance_(instance),
-      input_stub_(input_stub),
+      input_stub_(NULL),
       callback_factory_(this),
       has_focus_(false),
       mouse_lock_state_(MouseLockDisallowed),
       wheel_delta_x_(0),
       wheel_delta_y_(0),
       wheel_ticks_x_(0),
       wheel_ticks_y_(0) {
 }
 
-PepperInputHandler::~PepperInputHandler() {
-}
+PepperInputHandler::~PepperInputHandler() {}
 
 // Helper function to get the USB key code using the Dev InputEvent interface.
 uint32_t GetUsbKeyCode(pp::KeyboardInputEvent pp_key_event) {
   // Get the DOM3 |code| as a string.
   std::string codestr = pp_key_event.GetCode().AsString();
 
   // Convert the |code| string into a USB keycode.
   ui::KeycodeConverter* key_converter = ui::KeycodeConverter::GetInstance();
   return key_converter->CodeToUsbKeycode(codestr.c_str());
 }
@@ skipping 16 matching lines @@
         lock_states |= protocol::KeyEvent::LOCK_STATES_CAPSLOCK;
 
       if (modifiers & PP_INPUTEVENT_MODIFIER_NUMLOCKKEY)
         lock_states |= protocol::KeyEvent::LOCK_STATES_NUMLOCK;
 
       protocol::KeyEvent key_event;
       key_event.set_usb_keycode(GetUsbKeyCode(pp_key_event));
       key_event.set_pressed(event.GetType() == PP_INPUTEVENT_TYPE_KEYDOWN);
       key_event.set_lock_states(lock_states);
 
-      input_stub_->InjectKeyEvent(key_event);
+      if (input_stub_)
+        input_stub_->InjectKeyEvent(key_event);
       return true;
     }
 
     case PP_INPUTEVENT_TYPE_MOUSEDOWN:
     case PP_INPUTEVENT_TYPE_MOUSEUP: {
       if (!has_focus_)
         return false;
 
       pp::MouseInputEvent pp_mouse_event(event);
       protocol::MouseEvent mouse_event;
@@ skipping 16 matching lines @@
         mouse_event.set_x(pp_mouse_event.GetPosition().x());
         mouse_event.set_y(pp_mouse_event.GetPosition().y());
 
         // Add relative movement if the mouse is locked.
         if (mouse_lock_state_ == MouseLockOn) {
           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);
+        if (input_stub_)
+          input_stub_->InjectMouseEvent(mouse_event);
       }
       return true;
     }
 
     case PP_INPUTEVENT_TYPE_MOUSEMOVE:
     case PP_INPUTEVENT_TYPE_MOUSEENTER:
     case PP_INPUTEVENT_TYPE_MOUSELEAVE: {
       if (!has_focus_)
         return false;
 
       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());
 
       // Add relative movement if the mouse is locked.
       if (mouse_lock_state_ == MouseLockOn) {
         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);
+      if (input_stub_)
+        input_stub_->InjectMouseEvent(mouse_event);
       return true;
     }
 
     case PP_INPUTEVENT_TYPE_WHEEL: {
       if (!has_focus_)
         return false;
 
       pp::WheelInputEvent pp_wheel_event(event);
 
       // Don't handle scroll-by-page events, for now.
@@ skipping 25 matching lines @@
         // that can't inject pixel-based scroll events that the client will
         // accumulate them into tick-based scrolling, which gives a better
         // overall experience than trying to do this host-side.
         int ticks_x = static_cast<int>(wheel_ticks_x_);
         int ticks_y = static_cast<int>(wheel_ticks_y_);
         wheel_ticks_x_ -= ticks_x;
         wheel_ticks_y_ -= ticks_y;
         mouse_event.set_wheel_ticks_x(ticks_x);
         mouse_event.set_wheel_ticks_y(ticks_y);
 
-        input_stub_->InjectMouseEvent(mouse_event);
+        if (input_stub_)
+          input_stub_->InjectMouseEvent(mouse_event);
       }
       return true;
     }
 
     case PP_INPUTEVENT_TYPE_CHAR:
       // Consume but ignore character input events.
       return true;
 
     default: {
       VLOG(0) << "Unhandled input event: " << event.GetType();
@@ skipping 109 matching lines @@
     mouse_lock_state_ = MouseLockOff;
     UpdateMouseCursor();
   }
 
   // Cancel as needed.
   if (should_cancel)
     CancelMouseLock();
 }
 
 }  // namespace remoting