Refactoring of the client-side input pipeline and scaling dimension management.

remoting/client/plugin/chromoting_instance.h

 // Copyright (c) 2011 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.
 
 // TODO(ajwong): We need to come up with a better description of the
 // responsibilities for each thread.
 
 #ifndef REMOTING_CLIENT_PLUGIN_CHROMOTING_INSTANCE_H_
 #define REMOTING_CLIENT_PLUGIN_CHROMOTING_INSTANCE_H_
 
@@ skipping 14 matching lines @@
 
 namespace pp {
 class InputEvent;
 class Module;
 }  // namespace pp
 
 namespace remoting {
 
 namespace protocol {
 class ConnectionToHost;
+class KeyEventTracker;
 }  // namespace protocol
 
 class ChromotingClient;
 class ChromotingStats;
 class ClientContext;
-class InputHandler;
+class MouseInputFilter;
+class PepperInputHandler;
 class PepperView;
-class PepperViewProxy;
 class RectangleUpdateDecoder;
 
 struct ClientConfig;
 
 class ChromotingInstance : public pp::InstancePrivate {
  public:
   // The mimetype for which this plugin is registered.
   static const char kMimeType[];
 
   explicit ChromotingInstance(PP_Instance instance);
@@ skipping 58 matching lines @@
 
   PepperPluginThreadDelegate plugin_thread_delegate_;
   scoped_refptr<PluginMessageLoopProxy> plugin_message_loop_;
   ClientContext context_;
   scoped_ptr<protocol::ConnectionToHost> host_connection_;
   scoped_ptr<PepperView> view_;
 
   // True if scale to fit is enabled.
   bool scale_to_fit_;
 
-  // PepperViewProxy is refcounted and used to interface between chromoting
-  // objects and PepperView and perform thread switching. It wraps around
-  // |view_| and receives method calls on chromoting threads. These method
-  // calls are then delegates on the pepper thread. During destruction of
-  // ChromotingInstance we need to detach PepperViewProxy from PepperView since
-  // both ChromotingInstance and PepperView are destroyed and there will be
-  // outstanding tasks on the pepper message loop.
-  scoped_refptr<PepperViewProxy> view_proxy_;
   scoped_refptr<RectangleUpdateDecoder> rectangle_decoder_;
-  scoped_ptr<InputHandler> input_handler_;
+  scoped_ptr<MouseInputFilter> mouse_input_filter_;
+  scoped_ptr<protocol::KeyEventTracker> key_event_tracker_;
+  scoped_ptr<PepperInputHandler> input_handler_;
   scoped_ptr<ChromotingClient> client_;
 
   // XmppProxy is a refcounted interface used to perform thread-switching and
   // detaching between objects whose lifetimes are controlled by pepper, and
   // jingle_glue objects. This is used when if we start a sandboxed jingle
   // connection.
   scoped_refptr<PepperXmppProxy> xmpp_proxy_;
 
   // JavaScript interface to control this instance.
   // This wraps a ChromotingScriptableObject in a pp::Var.
   pp::Var instance_object_;
 
   scoped_ptr<ScopedThreadProxy> thread_proxy_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromotingInstance);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_CLIENT_PLUGIN_CHROMOTING_INSTANCE_H_