[Chromoting] Add a filter that will stop the host sending unnecessary clipboard events to the clien…

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/capturer.h"
 #include "remoting/proto/control.pb.h"
 #include "remoting/proto/event.pb.h"
+#include "remoting/protocol/client_stub.h"
 
 namespace remoting {
 
 ClientSession::ClientSession(
     EventHandler* event_handler,
     scoped_ptr<protocol::ConnectionToClient> connection,
     protocol::HostEventStub* host_event_stub,
     Capturer* capturer)
     : event_handler_(event_handler),
       connection_(connection.Pass()),
       client_jid_(connection_->session()->jid()),
       host_event_stub_(host_event_stub),
       input_tracker_(host_event_stub_),
       remote_input_filter_(&input_tracker_),
       mouse_input_filter_(&remote_input_filter_),
       capturer_(capturer) {
   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(this);
   connection_->set_host_stub(this);
   connection_->set_input_stub(this);
+  clipboard_duplicate_filter_.set_to_host(host_event_stub_);
+  clipboard_duplicate_filter_.set_to_client(connection_->client_stub());

[Wez, 2012/05/16 20:51:43]

Is client_stub() actually valid at this point, or do we need to wait and set it
only when we know we're connected?

[simonmorris, 2012/05/16 22:35:25]

I've moved this line to OnConnectionAuthenticated(), as we shouldn't send
anything to the client before then anyway.

 }
 
 ClientSession::~ClientSession() {
 }
 
 void ClientSession::InjectClipboardEvent(
     const protocol::ClipboardEvent& event) {
   DCHECK(CalledOnValidThread());
 
   // TODO(wez): Disable clipboard in both directions on local activity, and
   // replace these tests with a HostInputFilter (or ClipboardFilter).
   if (auth_input_filter_.input_stub() == NULL)
     return;
   if (disable_input_filter_.input_stub() == NULL)
     return;
 
-  host_event_stub_->InjectClipboardEvent(event);
+  clipboard_duplicate_filter_.get_filter_to_host()->InjectClipboardEvent(event);
 }
 
 void ClientSession::InjectKeyEvent(const protocol::KeyEvent& event) {
   DCHECK(CalledOnValidThread());
   auth_input_filter_.InjectKeyEvent(event);
 }
 
 void ClientSession::InjectMouseEvent(const protocol::MouseEvent& event) {
   DCHECK(CalledOnValidThread());
 
@@ skipping 89 matching lines @@
 
   if (disable_inputs) {
     disable_input_filter_.set_input_stub(NULL);
     input_tracker_.ReleaseAll();
   } else {
     disable_input_filter_.set_input_stub(&mouse_input_filter_);
   }
 }
 
 }  // namespace remoting