Touch Events capability negotiation

remoting/host/win/session_input_injector.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/win/session_input_injector.h"
 
 #include <set>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 48 matching lines @@
   virtual void Start(scoped_ptr<ClipboardStub> client_clipboard) override;
 
   // protocol::ClipboardStub implementation.
   virtual void InjectClipboardEvent(const ClipboardEvent& event) override;
 
   // protocol::InputStub implementation.
   virtual void InjectKeyEvent(const KeyEvent& event) override;
   virtual void InjectTextEvent(const TextEvent& event) override;
   virtual void InjectMouseEvent(const MouseEvent& event) override;
   virtual void InjectTouchEvent(const TouchEvent& event) override;
+  virtual bool CanInjectTouch() override;
 
  private:
   friend class base::RefCountedThreadSafe<Core>;
   virtual ~Core();
 
   // Switches to the desktop receiving a user input if different from
   // the current one.
   void SwitchToInputDesktop();
 
   scoped_refptr<base::SingleThreadTaskRunner> input_task_runner_;
@@ skipping 114 matching lines @@
   if (!input_task_runner_->BelongsToCurrentThread()) {
     input_task_runner_->PostTask(
         FROM_HERE, base::Bind(&Core::InjectTouchEvent, this, event));
     return;
   }
 
   SwitchToInputDesktop();
   nested_executor_->InjectTouchEvent(event);
 }
 
+bool SessionInputInjectorWin::Core::CanInjectTouch() {
+  return nested_executor_->CanInjectTouch();

[Wez, 2015/04/09 22:58:59]

You're accessing the |nested_executor_| from the caller thread, rather than from
the |input_task_runner_| thread.

Since we never expect the result to change at run-time, I'd suggest instead
calling CanInjectTouch() on the |input_task_runner_| and posting the result back
to the SessionInputInjectorWin (NOT the core) on the caller thread, to cache to
return from its own CanInjectTouch().

[Rintaro Kuroiwa, 2015/04/20 18:20:03]

N/A for latest patch.

+}
+
 SessionInputInjectorWin::Core::~Core() {
 }
 
 void SessionInputInjectorWin::Core::SwitchToInputDesktop() {
   // Switch to the desktop receiving user input if different from the current
   // one.
   scoped_ptr<webrtc::Desktop> input_desktop(
       webrtc::Desktop::GetInputDesktop());
   if (input_desktop.get() != nullptr && !desktop_.IsSame(*input_desktop)) {
     // If SetThreadDesktop() fails, the thread is still assigned a desktop.
@@ skipping 36 matching lines @@
 void SessionInputInjectorWin::InjectMouseEvent(
     const protocol::MouseEvent& event) {
   core_->InjectMouseEvent(event);
 }
 
 void SessionInputInjectorWin::InjectTouchEvent(
     const protocol::TouchEvent& event) {
   core_->InjectTouchEvent(event);
 }
 
+bool SessionInputInjectorWin::CanInjectTouch() {
+  return core_->CanInjectTouch();
+}
+
 }  // namespace remoting