Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / remoting / host / remote_input_filter.h

diff --git a/src/remoting/host/remote_input_filter.h b/src/remoting/host/remote_input_filter.h
index 4944ea3..1d2301c 100644 (file)
--- a/src/remoting/host/remote_input_filter.h
+++ b/src/remoting/host/remote_input_filter.h
@@ -12,7 +12,6 @@
 #include "base/time/time.h"
 #include "remoting/protocol/input_event_tracker.h"
 #include "remoting/protocol/input_stub.h"
-#include "third_party/skia/include/core/SkPoint.h"
 
 namespace remoting {
 
@@ -23,19 +22,20 @@ class RemoteInputFilter : public protocol::InputStub {
   // Creates a filter forwarding events to the specified InputEventTracker.
   // The filter needs a tracker to release buttons & keys when blocking input.
   explicit RemoteInputFilter(protocol::InputEventTracker* event_tracker);
-  virtual ~RemoteInputFilter();
+  ~RemoteInputFilter() override;
 
   // Informs the filter that local mouse activity has been detected.  If the
   // activity does not match events we injected then we assume that it is local,
   // and block remote input for a short while.
-  void LocalMouseMoved(const SkIPoint& mouse_pos);
+  void LocalMouseMoved(const webrtc::DesktopVector& mouse_pos);
 
   // Informs the filter that injecting input causes an echo.
   void SetExpectLocalEcho(bool expect_local_echo);
 
   // InputStub overrides.
-  virtual void InjectKeyEvent(const protocol::KeyEvent& event) OVERRIDE;
-  virtual void InjectMouseEvent(const protocol::MouseEvent& event) OVERRIDE;
+  void InjectKeyEvent(const protocol::KeyEvent& event) override;
+  void InjectTextEvent(const protocol::TextEvent& event) override;
+  void InjectMouseEvent(const protocol::MouseEvent& event) override;
 
  private:
   bool ShouldIgnoreInput() const;
@@ -44,7 +44,7 @@ class RemoteInputFilter : public protocol::InputStub {
 
   // Queue of recently-injected mouse positions used to distinguish echoes of
   // injected events from movements from a local input device.
-  std::list<SkIPoint> injected_mouse_positions_;
+  std::list<webrtc::DesktopVector> injected_mouse_positions_;
 
   // Time at which local input events were most recently observed.
   base::TimeTicks latest_local_input_time_;