Add MouseClampingFilter and update ClientSession to use it.

remoting/host/client_session.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/host/client_session.h"
 
 #include <algorithm>
 
 #include "base/message_loop_proxy.h"
 #include "remoting/host/video_frame_capturer.h"
@@ skipping 12 matching lines @@
     VideoFrameCapturer* capturer,
     const base::TimeDelta& max_duration)
     : event_handler_(event_handler),
       connection_(connection.Pass()),
       client_jid_(connection_->session()->jid()),
       is_authenticated_(false),
       host_clipboard_stub_(host_clipboard_stub),
       host_input_stub_(host_input_stub),
       input_tracker_(host_input_stub_),
       remote_input_filter_(&input_tracker_),
-      mouse_input_filter_(&remote_input_filter_),
+      mouse_clamping_filter_(capturer, &remote_input_filter_),
       client_clipboard_factory_(clipboard_echo_filter_.client_filter()),
       capturer_(capturer),
       max_duration_(max_duration) {
   connection_->SetEventHandler(this);
 
   // TODO(sergeyu): Currently ConnectionToClient expects stubs to be
   // set before channels are connected. Make it possible to set stubs
   // later and set them only when connection is authenticated.
   connection_->set_clipboard_stub(&auth_clipboard_filter_);
   connection_->set_host_stub(this);
-  connection_->set_input_stub(this);
+  connection_->set_input_stub(&auth_input_filter_);
   clipboard_echo_filter_.set_host_stub(host_clipboard_stub_);
 }
 
 ClientSession::~ClientSession() {
 }
 
-void ClientSession::InjectKeyEvent(const protocol::KeyEvent& event) {
-  DCHECK(CalledOnValidThread());
-  auth_input_filter_.InjectKeyEvent(event);
-}
-
-void ClientSession::InjectMouseEvent(const protocol::MouseEvent& event) {
-  DCHECK(CalledOnValidThread());
-
-  // Ensure that the MouseInputFilter is clamping to the current dimensions.
-  mouse_input_filter_.set_output_size(capturer_->size_most_recent());
-  mouse_input_filter_.set_input_size(capturer_->size_most_recent());
-
-  auth_input_filter_.InjectMouseEvent(event);
-}
-
 void ClientSession::NotifyClientDimensions(
     const protocol::ClientDimensions& dimensions) {
   // TODO(wez): Use the dimensions, e.g. to resize the host desktop to match.
   if (dimensions.has_width() && dimensions.has_height()) {
     VLOG(1) << "Received ClientDimensions (width="
             << dimensions.width() << ", height=" << dimensions.height() << ")";
   }
 }
 
 void ClientSession::ControlVideo(const protocol::VideoControl& video_control) {
@@ skipping 83 matching lines @@
 }
 
 void ClientSession::SetDisableInputs(bool disable_inputs) {
   DCHECK(CalledOnValidThread());
 
   if (disable_inputs) {
     disable_input_filter_.set_input_stub(NULL);
     disable_clipboard_filter_.set_clipboard_stub(NULL);
     input_tracker_.ReleaseAll();
   } else {
-    disable_input_filter_.set_input_stub(&mouse_input_filter_);
+    disable_input_filter_.set_input_stub(&mouse_clamping_filter_);
     disable_clipboard_filter_.set_clipboard_stub(
         clipboard_echo_filter_.host_filter());
   }
 }
 
 scoped_ptr<protocol::ClipboardStub> ClientSession::CreateClipboardProxy() {
   DCHECK(CalledOnValidThread());
 
   return scoped_ptr<protocol::ClipboardStub>(
       new protocol::ClipboardThreadProxy(
           client_clipboard_factory_.GetWeakPtr(),
           base::MessageLoopProxy::current()));
 }
 
 }  // namespace remoting