summaryrefslogtreecommitdiffstats
path: root/remoting/protocol
diff options
context:
space:
mode:
Diffstat (limited to 'remoting/protocol')
-rw-r--r--remoting/protocol/input_event_tracker.cc3
-rw-r--r--remoting/protocol/input_event_tracker.h4
-rw-r--r--remoting/protocol/mouse_input_filter.cc12
-rw-r--r--remoting/protocol/mouse_input_filter.h11
-rw-r--r--remoting/protocol/mouse_input_filter_unittest.cc38
5 files changed, 35 insertions, 33 deletions
diff --git a/remoting/protocol/input_event_tracker.cc b/remoting/protocol/input_event_tracker.cc
index 7090d4d..331546a 100644
--- a/remoting/protocol/input_event_tracker.cc
+++ b/remoting/protocol/input_event_tracker.cc
@@ -12,7 +12,6 @@ namespace protocol {
InputEventTracker::InputEventTracker(InputStub* input_stub)
: input_stub_(input_stub),
- mouse_pos_(SkIPoint::Make(0, 0)),
mouse_button_state_(0) {
}
@@ -74,7 +73,7 @@ void InputEventTracker::InjectKeyEvent(const KeyEvent& event) {
void InputEventTracker::InjectMouseEvent(const MouseEvent& event) {
if (event.has_x() && event.has_y()) {
- mouse_pos_ = SkIPoint::Make(event.x(), event.y());
+ mouse_pos_ = webrtc::DesktopVector(event.x(), event.y());
}
if (event.has_button() && event.has_button_down()) {
// Button values are defined in remoting/proto/event.proto.
diff --git a/remoting/protocol/input_event_tracker.h b/remoting/protocol/input_event_tracker.h
index 794fffe9..8e0bda7 100644
--- a/remoting/protocol/input_event_tracker.h
+++ b/remoting/protocol/input_event_tracker.h
@@ -10,7 +10,7 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "remoting/protocol/input_stub.h"
-#include "third_party/skia/include/core/SkPoint.h"
+#include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
namespace remoting {
namespace protocol {
@@ -42,7 +42,7 @@ class InputEventTracker : public InputStub {
std::set<uint32> pressed_keys_;
- SkIPoint mouse_pos_;
+ webrtc::DesktopVector mouse_pos_;
uint32 mouse_button_state_;
DISALLOW_COPY_AND_ASSIGN(InputEventTracker);
diff --git a/remoting/protocol/mouse_input_filter.cc b/remoting/protocol/mouse_input_filter.cc
index 5a11fa8..f394341 100644
--- a/remoting/protocol/mouse_input_filter.cc
+++ b/remoting/protocol/mouse_input_filter.cc
@@ -14,15 +14,13 @@ MouseInputFilter::MouseInputFilter() {
MouseInputFilter::MouseInputFilter(InputStub* input_stub)
: InputFilter(input_stub) {
- input_max_.setEmpty();
- output_max_.setEmpty();
}
MouseInputFilter::~MouseInputFilter() {
}
void MouseInputFilter::InjectMouseEvent(const MouseEvent& event) {
- if (input_max_.isEmpty() || output_max_.isEmpty())
+ if (input_max_.is_empty() || output_max_.is_empty())
return;
// We scale based on the maximum input & output coordinates, rather than the
@@ -44,12 +42,12 @@ void MouseInputFilter::InjectMouseEvent(const MouseEvent& event) {
InputFilter::InjectMouseEvent(out_event);
}
-void MouseInputFilter::set_input_size(const SkISize& size) {
- input_max_ = SkISize::Make(size.width() - 1, size.height() - 1);
+void MouseInputFilter::set_input_size(const webrtc::DesktopSize& size) {
+ input_max_.set(size.width() - 1, size.height() - 1);
}
-void MouseInputFilter::set_output_size(const SkISize& size) {
- output_max_ = SkISize::Make(size.width() - 1, size.height() - 1);
+void MouseInputFilter::set_output_size(const webrtc::DesktopSize& size) {
+ output_max_.set(size.width() - 1, size.height() - 1);
}
} // namespace protocol
diff --git a/remoting/protocol/mouse_input_filter.h b/remoting/protocol/mouse_input_filter.h
index f83af93..47dae11 100644
--- a/remoting/protocol/mouse_input_filter.h
+++ b/remoting/protocol/mouse_input_filter.h
@@ -7,8 +7,7 @@
#include "base/compiler_specific.h"
#include "remoting/protocol/input_filter.h"
-#include "third_party/skia/include/core/SkTypes.h"
-#include "third_party/skia/include/core/SkSize.h"
+#include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
namespace remoting {
namespace protocol {
@@ -23,17 +22,17 @@ class MouseInputFilter : public InputFilter {
virtual ~MouseInputFilter();
// Specify the input dimensions for mouse events.
- void set_input_size(const SkISize& size);
+ void set_input_size(const webrtc::DesktopSize& size);
// Specify the output dimensions.
- void set_output_size(const SkISize& size);
+ void set_output_size(const webrtc::DesktopSize& size);
// InputStub overrides.
virtual void InjectMouseEvent(const protocol::MouseEvent& event) OVERRIDE;
private:
- SkISize input_max_;
- SkISize output_max_;
+ webrtc::DesktopSize input_max_;
+ webrtc::DesktopSize output_max_;
DISALLOW_COPY_AND_ASSIGN(MouseInputFilter);
};
diff --git a/remoting/protocol/mouse_input_filter_unittest.cc b/remoting/protocol/mouse_input_filter_unittest.cc
index 376decd..6c98930 100644
--- a/remoting/protocol/mouse_input_filter_unittest.cc
+++ b/remoting/protocol/mouse_input_filter_unittest.cc
@@ -8,7 +8,7 @@
#include "remoting/protocol/protocol_mock_objects.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/skia/include/core/SkPoint.h"
+#include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
using ::testing::_;
using ::testing::InSequence;
@@ -28,16 +28,22 @@ static MouseEvent MouseMoveEvent(int x, int y) {
}
static void InjectTestSequence(InputStub* input_stub) {
- static const SkIPoint input_sequence[] = {
+ struct Point {
+ int x;
+ int y;
+ };
+ static const Point input_sequence[] = {
{-5, 10}, {0, 10}, {-1, 10}, {15, 40}, {15, 45}, {15, 39}, {15, 25}
};
- for (unsigned int i=0; i<arraysize(input_sequence); ++i) {
- const SkIPoint& point = input_sequence[i];
- input_stub->InjectMouseEvent(MouseMoveEvent(point.x(), point.y()));
+ // arraysize() cannot be used here, becase Point is declared inside of a
+ // function.
+ for (unsigned int i = 0; i < ARRAYSIZE_UNSAFE(input_sequence); ++i) {
+ const Point& point = input_sequence[i];
+ input_stub->InjectMouseEvent(MouseMoveEvent(point.x, point.y));
}
- for (unsigned int i=0; i<arraysize(input_sequence); ++i) {
- const SkIPoint& point = input_sequence[i];
- input_stub->InjectMouseEvent(MouseMoveEvent(point.y(), point.x()));
+ for (unsigned int i = 0; i < ARRAYSIZE_UNSAFE(input_sequence); ++i) {
+ const Point& point = input_sequence[i];
+ input_stub->InjectMouseEvent(MouseMoveEvent(point.y, point.x));
}
}
@@ -56,7 +62,7 @@ TEST(MouseInputFilterTest, BothDimensionsZero) {
TEST(MouseInputFilterTest, InputDimensionsZero) {
MockInputStub mock_stub;
MouseInputFilter mouse_filter(&mock_stub);
- mouse_filter.set_output_size(SkISize::Make(50,50));
+ mouse_filter.set_output_size(webrtc::DesktopSize(50, 50));
EXPECT_CALL(mock_stub, InjectMouseEvent(_))
.Times(0);
@@ -68,7 +74,7 @@ TEST(MouseInputFilterTest, InputDimensionsZero) {
TEST(MouseInputFilterTest, OutputDimensionsZero) {
MockInputStub mock_stub;
MouseInputFilter mouse_filter(&mock_stub);
- mouse_filter.set_input_size(SkISize::Make(50,50));
+ mouse_filter.set_input_size(webrtc::DesktopSize(50, 50));
EXPECT_CALL(mock_stub, InjectMouseEvent(_))
.Times(0);
@@ -80,8 +86,8 @@ TEST(MouseInputFilterTest, OutputDimensionsZero) {
TEST(MouseInputFilterTest, NoScalingOrClipping) {
MockInputStub mock_stub;
MouseInputFilter mouse_filter(&mock_stub);
- mouse_filter.set_output_size(SkISize::Make(40,40));
- mouse_filter.set_input_size(SkISize::Make(40,40));
+ mouse_filter.set_output_size(webrtc::DesktopSize(40,40));
+ mouse_filter.set_input_size(webrtc::DesktopSize(40,40));
{
InSequence s;
@@ -108,8 +114,8 @@ TEST(MouseInputFilterTest, NoScalingOrClipping) {
TEST(MouseInputFilterTest, UpScalingAndClamping) {
MockInputStub mock_stub;
MouseInputFilter mouse_filter(&mock_stub);
- mouse_filter.set_output_size(SkISize::Make(80,80));
- mouse_filter.set_input_size(SkISize::Make(40,40));
+ mouse_filter.set_output_size(webrtc::DesktopSize(80, 80));
+ mouse_filter.set_input_size(webrtc::DesktopSize(40, 40));
{
InSequence s;
@@ -136,8 +142,8 @@ TEST(MouseInputFilterTest, UpScalingAndClamping) {
TEST(MouseInputFilterTest, DownScalingAndClamping) {
MockInputStub mock_stub;
MouseInputFilter mouse_filter(&mock_stub);
- mouse_filter.set_output_size(SkISize::Make(30,30));
- mouse_filter.set_input_size(SkISize::Make(40,40));
+ mouse_filter.set_output_size(webrtc::DesktopSize(30, 30));
+ mouse_filter.set_input_size(webrtc::DesktopSize(40, 40));
{
InSequence s;
generated by cgit v1.1 at 2025-03-11 16:41:36 +0000