diff options
author | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-30 20:54:37 +0000 |
---|---|---|
committer | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-30 20:54:37 +0000 |
commit | f5d62e36705c2a21f3d4fe309a8fb26514c26cbb (patch) | |
tree | 68d57dd83207feb4ca618cccba168d32e257023f /remoting/client/plugin | |
parent | da804b66ac50539447c777f809d6829d074137a0 (diff) | |
download | chromium_src-f5d62e36705c2a21f3d4fe309a8fb26514c26cbb.zip chromium_src-f5d62e36705c2a21f3d4fe309a8fb26514c26cbb.tar.gz chromium_src-f5d62e36705c2a21f3d4fe309a8fb26514c26cbb.tar.bz2 |
Clamp events before they are sent to EventExecutors.
* MouseInputFilter is moved from remoting/client/ to remoting/protocol/.
* ClientSession now implements clamping using MouseInputFilter.
* EventExecutors no longer drop out-of-bounds events.
BUG=118511
Review URL: http://codereview.chromium.org/10255007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134594 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/client/plugin')
-rw-r--r-- | remoting/client/plugin/chromoting_instance.cc | 4 | ||||
-rw-r--r-- | remoting/client/plugin/chromoting_instance.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc index 1671d71..c72b578 100644 --- a/remoting/client/plugin/chromoting_instance.cc +++ b/remoting/client/plugin/chromoting_instance.cc @@ -30,7 +30,6 @@ #include "remoting/client/client_config.h" #include "remoting/client/chromoting_client.h" #include "remoting/client/frame_consumer_proxy.h" -#include "remoting/client/mouse_input_filter.h" #include "remoting/client/plugin/chromoting_scriptable_object.h" #include "remoting/client/plugin/pepper_input_handler.h" #include "remoting/client/plugin/pepper_view.h" @@ -39,6 +38,7 @@ #include "remoting/protocol/connection_to_host.h" #include "remoting/protocol/host_stub.h" #include "remoting/protocol/input_event_tracker.h" +#include "remoting/protocol/mouse_input_filter.h" // Windows defines 'PostMessage', so we have to undef it. #if defined(PostMessage) @@ -387,7 +387,7 @@ void ChromotingInstance::Connect(const ClientConfig& config) { // Construct the input pipeline mouse_input_filter_.reset( - new MouseInputFilter(host_connection_->input_stub())); + new protocol::MouseInputFilter(host_connection_->input_stub())); mouse_input_filter_->set_input_size(view_->get_view_size()); input_tracker_.reset( new protocol::InputEventTracker(mouse_input_filter_.get())); diff --git a/remoting/client/plugin/chromoting_instance.h b/remoting/client/plugin/chromoting_instance.h index 7a58039..fb34751 100644 --- a/remoting/client/plugin/chromoting_instance.h +++ b/remoting/client/plugin/chromoting_instance.h @@ -47,6 +47,7 @@ namespace remoting { namespace protocol { class ConnectionToHost; class InputEventTracker; +class MouseInputFilter; } // namespace protocol class ChromotingClient; @@ -54,7 +55,6 @@ class ChromotingScriptableObject; class ChromotingStats; class ClientContext; class FrameConsumerProxy; -class MouseInputFilter; class PepperInputHandler; class PepperView; class PepperXmppProxy; @@ -198,7 +198,7 @@ class ChromotingInstance : scoped_ptr<PepperView> view_; scoped_refptr<RectangleUpdateDecoder> rectangle_decoder_; - scoped_ptr<MouseInputFilter> mouse_input_filter_; + scoped_ptr<protocol::MouseInputFilter> mouse_input_filter_; scoped_ptr<protocol::InputEventTracker> input_tracker_; KeyEventMapper key_mapper_; scoped_ptr<PepperInputHandler> input_handler_; |