Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(81)

Side by Side Diff: remoting/protocol/mouse_input_filter.cc

Issue 23440046: Remove dependency on Skia from chromoting client. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "remoting/protocol/mouse_input_filter.h" 5 #include "remoting/protocol/mouse_input_filter.h"
6 6
7 #include "remoting/proto/event.pb.h" 7 #include "remoting/proto/event.pb.h"
8 8
9 namespace remoting { 9 namespace remoting {
10 namespace protocol { 10 namespace protocol {
11 11
12 MouseInputFilter::MouseInputFilter() { 12 MouseInputFilter::MouseInputFilter() {
13 } 13 }
14 14
15 MouseInputFilter::MouseInputFilter(InputStub* input_stub) 15 MouseInputFilter::MouseInputFilter(InputStub* input_stub)
16 : InputFilter(input_stub) { 16 : InputFilter(input_stub) {
17 input_max_.setEmpty();
18 output_max_.setEmpty();
19 } 17 }
20 18
21 MouseInputFilter::~MouseInputFilter() { 19 MouseInputFilter::~MouseInputFilter() {
22 } 20 }
23 21
24 void MouseInputFilter::InjectMouseEvent(const MouseEvent& event) { 22 void MouseInputFilter::InjectMouseEvent(const MouseEvent& event) {
25 if (input_max_.isEmpty() || output_max_.isEmpty()) 23 if (input_max_.is_empty() || output_max_.is_empty())
26 return; 24 return;
27 25
28 // We scale based on the maximum input & output coordinates, rather than the 26 // We scale based on the maximum input & output coordinates, rather than the
29 // input and output sizes, so that it's possible to reach the edge of the 27 // input and output sizes, so that it's possible to reach the edge of the
30 // output when up-scaling. We also take care to round up or down correctly, 28 // output when up-scaling. We also take care to round up or down correctly,
31 // which is important when down-scaling. 29 // which is important when down-scaling.
32 MouseEvent out_event(event); 30 MouseEvent out_event(event);
33 if (out_event.has_x()) { 31 if (out_event.has_x()) {
34 int x = out_event.x() * output_max_.width(); 32 int x = out_event.x() * output_max_.width();
35 x = (x + input_max_.width() / 2) / input_max_.width(); 33 x = (x + input_max_.width() / 2) / input_max_.width();
36 out_event.set_x(std::max(0, std::min(output_max_.width(), x))); 34 out_event.set_x(std::max(0, std::min(output_max_.width(), x)));
37 } 35 }
38 if (out_event.has_y()) { 36 if (out_event.has_y()) {
39 int y = out_event.y() * output_max_.height(); 37 int y = out_event.y() * output_max_.height();
40 y = (y + input_max_.height() / 2) / input_max_.height(); 38 y = (y + input_max_.height() / 2) / input_max_.height();
41 out_event.set_y(std::max(0, std::min(output_max_.height(), y))); 39 out_event.set_y(std::max(0, std::min(output_max_.height(), y)));
42 } 40 }
43 41
44 InputFilter::InjectMouseEvent(out_event); 42 InputFilter::InjectMouseEvent(out_event);
45 } 43 }
46 44
47 void MouseInputFilter::set_input_size(const SkISize& size) { 45 void MouseInputFilter::set_input_size(const webrtc::DesktopSize& size) {
48 input_max_ = SkISize::Make(size.width() - 1, size.height() - 1); 46 input_max_.set(size.width() - 1, size.height() - 1);
49 } 47 }
50 48
51 void MouseInputFilter::set_output_size(const SkISize& size) { 49 void MouseInputFilter::set_output_size(const webrtc::DesktopSize& size) {
52 output_max_ = SkISize::Make(size.width() - 1, size.height() - 1); 50 output_max_.set(size.width() - 1, size.height() - 1);
53 } 51 }
54 52
55 } // namespace protocol 53 } // namespace protocol
56 } // namespace remoting 54 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/protocol/mouse_input_filter.h ('k') | remoting/protocol/mouse_input_filter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698