Merge lp:~afrantzis/mir/maybe-fix-1511095 into lp:mir

[Alexandros Frantzis]

input: Return an empty input region bounding rectangle when there are no outputs

input: Return an empty input region bounding rectangle when there are no outputs

This MP *may* fix bug 1511095, but even if it turns out not to be a complete fix for that bug, it is definitely an improvement.

[Alan Griffiths (alan-griffiths)]

definitely avoids undefined behaviour

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3069
http://jenkins.qa.ubuntu.com/job/mir-ci/5458/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4722
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3629
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4664/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/622/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1612
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1612/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/622
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/622/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4665
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4665/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7278/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24731
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/623/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5458/rebuild

review: Needs Fixing (continuous-integration)

[Alberto Aguirre (albaguirre)]

LGTM.

review: Approve

[Daniel van Vugt (vanvugt)]

Looks like it will avoid a crash (or undefined behaviour) if nothing else.

review: Approve

[Daniel van Vugt (vanvugt)]

Hmm, or would "rectangles.bounding_rectangle()" be better?

review: Needs Information

[Alexandros Frantzis (afrantzis)]

rectangles.begin() was rectangles.bounding_rectangle() some time ago, but it was changed because the latter caused incorrect input scaling (https://bugs.launchpad.net/mir/+bug/1498540).

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/2068/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4764
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3671
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4706/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/664/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-autolanding/623
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-autolanding/623/artifact/work/output/*zip*/output.zip
    None: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/664/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4707
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4707/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7314/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24851
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/665/console

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

Hmm mi::DisplayInputRegion::bounding_rectangle() needs some revising I think. It makes a list of rectangles only to use the first one and then destroys the list.

[Daniel van Vugt (vanvugt)]

review: Abstain

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/2078/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4776
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3683/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4718
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/676/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-autolanding/633
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-autolanding/633/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/676
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/676/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4719
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4719/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7326
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24878
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/677/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/server/input/display_input_region.cpp'
--- src/server/input/display_input_region.cpp	2015-09-24 02:16:12 +0000
+++ src/server/input/display_input_region.cpp	2015-10-30 10:29:34 +0000
@@ -51,7 +51,10 @@
     // to group a touchscreen with a display. So for now, just return the view area
     // of the first display, as that matches the most common systems (laptops with touchscreens,
     // phone/tablets with touchscreens).
-    return *rectangles.begin();
+    if (rectangles.size() != 0)
+        return *rectangles.begin();
+    else
+        return geom::Rectangle{};
 }
 
 void mi::DisplayInputRegion::confine(geom::Point& point)

=== modified file 'tests/unit-tests/input/test_display_input_region.cpp'
--- tests/unit-tests/input/test_display_input_region.cpp	2015-09-24 02:16:12 +0000
+++ tests/unit-tests/input/test_display_input_region.cpp	2015-10-30 10:29:34 +0000
@@ -80,3 +80,14 @@
     }
 
 }
+
+TEST(DisplayInputRegionTest, returns_empty_bounding_rectangle_when_there_are_no_outputs)
+{
+    geom::Rectangle const empty_rect{};
+    auto const stub_display = std::make_shared<mtd::StubDisplay>(0);
+
+    mi::DisplayInputRegion input_region{stub_display};
+
+    auto const bounding_rect = input_region.bounding_rectangle();
+    EXPECT_EQ(empty_rect, bounding_rect);
+}