mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-13 05:40:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix clearing of mouse cursor if display uses a scale factor

Browse source 
When a display uses a scale factor (different than 1.0) the previous
cursor position is not properly cleared during a CRD connection on
ChromeOS (see b/235191365).

The issue was that the fix for crbug.com/1323241 does not take device
scaling into account, so that fix would incorrectly not mark the
previous location of the mouse cursor as modified.

Adding proper boundary checks is hard and risky though, as the way the
position of the mouse cursor is reported seems to be platform dependent
(ChromeOS vs Linux vs ...).
So because crbug.com/1323241 only solves a theoretical crash that is rarely if
ever hit in the field, I decided to for now undo the fix for crbug.com/1323241.
A proper boundary check can then later be introduced without any pressure from
a looming release

Bug: chromium:1323241
Bug: b/235191365
Fixed: b/235191365
Test: Manually deployed
Change-Id: Ib09b6cc5e396bd52538332edfc4395ed80c6786e
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/265391
Reviewed-by: Alexander Cooper <alcooper@chromium.org>
Reviewed-by: Joe Downing <joedow@google.com>
Commit-Queue: Jeroen Dhollander <jeroendh@google.com>
Cr-Commit-Position: refs/heads/main@{#37274}
This commit is contained in:
Jeroen Dhollander 2022-06-10 13:23:04 +00:00 committed by WebRTC LUCI CQ
parent 3627d57849
commit ff45105b42
2 changed files with 6 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
modules/desktop_capture/desktop_and_cursor_composer.cc
View file

@ -105,11 +105,12 @@ DesktopFrameWithCursor::DesktopFrameWithCursor(
if (!previous_cursor_rect.equals(cursor_rect_)) { if (!previous_cursor_rect.equals(cursor_rect_)) {
mutable_updated_region()->AddRect(cursor_rect_); mutable_updated_region()->AddRect(cursor_rect_);
// TODO(crbug:1323241) Update this code to properly handle the case where
// Only add the previous cursor if it is inside the frame. // |previous_cursor_rect| is outside of the boundaries of |frame|.
// (it can be outside the frame if the desktop has been resized). // Any boundary check has to take into account the fact that
if (original_frame_->rect().ContainsRect(previous_cursor_rect)) // |previous_cursor_rect| can be in DPI or in pixels, based on the platform
mutable_updated_region()->AddRect(previous_cursor_rect); // we're running on.
mutable_updated_region()->AddRect(previous_cursor_rect);
} else if (cursor_changed) { } else if (cursor_changed) {
mutable_updated_region()->AddRect(cursor_rect_); mutable_updated_region()->AddRect(cursor_rect_);
} }

35
modules/desktop_capture/desktop_and_cursor_composer_unittest.cc
View file

@ -105,15 +105,6 @@ MouseCursor* CreateTestCursor(DesktopVector hotspot) {
return new MouseCursor(image.release(), hotspot); return new MouseCursor(image.release(), hotspot);
} }
std::vector<DesktopRect> GetUpdatedRegions(const DesktopFrame& frame) {
std::vector<DesktopRect> result;
for (webrtc::DesktopRegion::Iterator i(frame.updated_region()); !i.IsAtEnd();
i.Advance()) {
result.push_back(i.rect());
}
return result;
}
class FakeScreenCapturer : public DesktopCapturer { class FakeScreenCapturer : public DesktopCapturer {
public: public:
FakeScreenCapturer() {} FakeScreenCapturer() {}
@ -436,32 +427,6 @@ TEST_F(DesktopAndCursorComposerNoCursorMonitorTest,
EXPECT_TRUE(frame_->updated_region().Equals(expected_region)); EXPECT_TRUE(frame_->updated_region().Equals(expected_region));
} }
TEST_F(DesktopAndCursorComposerNoCursorMonitorTest,
UpdatedRegionDoesNotIncludeOldCursorIfOutOfBounds) {
blender_.OnMouseCursor(CreateTestCursor(DesktopVector(0, 0)));
std::unique_ptr<SharedDesktopFrame> first_frame(
SharedDesktopFrame::Wrap(CreateTestFrame(1000, 1000)));
blender_.OnMouseCursorPosition(DesktopVector(900, 900));
fake_screen_->SetNextFrame(first_frame->Share());
blender_.CaptureFrame();
// Second frame is smaller than first frame, and the first cursor is outside
// of the bounds of the new frame, so it should not be in the updated region.
std::unique_ptr<SharedDesktopFrame> second_frame(
SharedDesktopFrame::Wrap(CreateTestFrame(500, 500)));
auto second_cursor_rect =
DesktopRect::MakeXYWH(400, 400, kCursorWidth, kCursorHeight);
blender_.OnMouseCursorPosition(DesktopVector(400, 400));
fake_screen_->SetNextFrame(second_frame->Share());
blender_.CaptureFrame();
DesktopRegion expected_region;
expected_region.AddRect(second_cursor_rect);
EXPECT_THAT(GetUpdatedRegions(*frame_), ElementsAre(second_cursor_rect));
}
TEST_F(DesktopAndCursorComposerNoCursorMonitorTest, TEST_F(DesktopAndCursorComposerNoCursorMonitorTest,
UpdatedRegionIncludesOldAndNewCursorRectsIfShapeChanged) { UpdatedRegionIncludesOldAndNewCursorRectsIfShapeChanged) {
std::unique_ptr<SharedDesktopFrame> frame( std::unique_ptr<SharedDesktopFrame> frame(