Remote assistance on Chrome OS Part IX - Input injection on Ozone

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/message_loop_proxy.h"
 #include "remoting/base/capabilities.h"
 #include "remoting/base/logging.h"
 #include "remoting/codec/audio_encoder.h"
 #include "remoting/codec/audio_encoder_opus.h"
 #include "remoting/codec/audio_encoder_verbatim.h"
 #include "remoting/codec/video_encoder.h"
 #include "remoting/codec/video_encoder_verbatim.h"
 #include "remoting/codec/video_encoder_vpx.h"
 #include "remoting/host/audio_capturer.h"
 #include "remoting/host/audio_scheduler.h"
 #include "remoting/host/desktop_environment.h"
+#include "remoting/host/display_rotation_filter.h"
 #include "remoting/host/host_extension_session.h"
 #include "remoting/host/input_injector.h"
 #include "remoting/host/screen_controls.h"
 #include "remoting/host/screen_resolution.h"
 #include "remoting/host/video_scheduler.h"
 #include "remoting/proto/control.pb.h"
 #include "remoting/proto/event.pb.h"
 #include "remoting/protocol/client_stub.h"
 #include "remoting/protocol/clipboard_thread_proxy.h"
 #include "remoting/protocol/pairing_registry.h"
@@ skipping 16 matching lines @@
     DesktopEnvironmentFactory* desktop_environment_factory,
     const base::TimeDelta& max_duration,
     scoped_refptr<protocol::PairingRegistry> pairing_registry,
     const std::vector<HostExtension*>& extensions)
     : event_handler_(event_handler),
       connection_(connection.Pass()),
       client_jid_(connection_->session()->jid()),
       desktop_environment_factory_(desktop_environment_factory),
       input_tracker_(&host_input_filter_),
       remote_input_filter_(&input_tracker_),
-      mouse_clamping_filter_(&remote_input_filter_),
+      display_rotation_filter_(
+          CreateDisplayRotationFilter(&remote_input_filter_)),

[Wez, 2014/11/26 02:28:34]

This feels like a property of the DesktopEnvironment, not a process-global
property - it may even be better to push creation of this filter into the
DesktopEnvironment for CrOS.

[kelvinp, 2014/12/02 00:12:26]

Done.

[kelvinp, 2014/12/02 00:12:26]

Done.

+      mouse_clamping_filter_(display_rotation_filter_.get()),

[Wez, 2014/11/26 02:28:34]

Use *display_rotation_filter_ here. In general, avoid using scoped_ptr<>::get()
unless you really really need to; operator* and operator-> will both DCHECK if
the scoped_ptr<> is NULL, to give clean failures.

[kelvinp, 2014/12/02 00:12:26]

*display_rotation_filter_  returns an InputStub&, but the constructor of of
MouseClampingFilter expects a InputStub*

       disable_input_filter_(mouse_clamping_filter_.input_filter()),
       disable_clipboard_filter_(clipboard_echo_filter_.host_filter()),
       auth_input_filter_(&disable_input_filter_),
       auth_clipboard_filter_(&disable_clipboard_filter_),
       client_clipboard_factory_(clipboard_echo_filter_.client_filter()),
       max_duration_(max_duration),
       audio_task_runner_(audio_task_runner),
       input_task_runner_(input_task_runner),
       video_capture_task_runner_(video_capture_task_runner),
       video_encode_task_runner_(video_encode_task_runner),
@@ skipping 445 matching lines @@
     return make_scoped_ptr(new AudioEncoderVerbatim());
   } else if (audio_config.codec == protocol::ChannelConfig::CODEC_OPUS) {
     return make_scoped_ptr(new AudioEncoderOpus());
   }
 
   NOTREACHED();
   return nullptr;
 }
 
 }  // namespace remoting