Merge lp:~vanvugt/mir/fix-1301115 into lp:mir

[Daniel van Vugt]

Ensure partially-offscreen surfaces are not culled as if they were fully
off screen (LP: #1301115)

[Chris Halse Rogers (raof)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1524
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/1221/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/1448
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/1446
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/1026
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/953
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/953/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/958
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/958/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/1027
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/1027/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/954
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5537

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/1221/rebuild

review: Approve (continuous-integration)

[Chris Halse Rogers (raof)]

Seems simple enough to top-approve with one approval.

=== modified file 'src/server/compositor/occlusion.cpp'
--- src/server/compositor/occlusion.cpp	2014-04-01 20:39:59 +0000
+++ src/server/compositor/occlusion.cpp	2014-04-02 03:15:07 +0000
@@ -41,7 +41,7 @@
         return true;  //invisible; definitely occluded.
 
     // Not weirdly transformed but also not on this monitor? Don't care...
-    if (!area.contains(renderable.screen_position()))
+    if (!area.overlaps(renderable.screen_position()))
         return true;  // Not on the display; definitely occluded.
 
     bool occluded = false;

=== modified file 'tests/unit-tests/compositor/test_occlusion.cpp'
--- tests/unit-tests/compositor/test_occlusion.cpp	2014-03-28 20:25:41 +0000
+++ tests/unit-tests/compositor/test_occlusion.cpp	2014-04-02 03:15:07 +0000
@@ -50,6 +50,18 @@
     EXPECT_EQ(window, list.front());
 }
 
+TEST_F(OcclusionFilterTest, partially_offscreen_still_visible)
+{ // Regression test for LP: #1301115
+    auto left =   std::make_shared<mtd::FakeRenderable>(-10,   10, 100, 100);
+    auto right =  std::make_shared<mtd::FakeRenderable>(1900,  10, 100, 100);
+    auto top =    std::make_shared<mtd::FakeRenderable>(500,   -1, 100, 100);
+    auto bottom = std::make_shared<mtd::FakeRenderable>(200, 1000, 100, 1000);
+    mg::RenderableList list{left, right, top, bottom};
+ 
+    filter_occlusions_from(list, monitor_rect);
+    EXPECT_EQ(4u, list.size());
+}
+
 TEST_F(OcclusionFilterTest, smaller_window_occluded)
 {
     auto top = std::make_shared<mtd::FakeRenderable>(10, 10, 10, 10);