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

[Daniel van Vugt]

BypassFilter: Remember to check that a surface is not hidden and has had a
buffer posted before allowing it to be bypassed. Or else you will see
something you shouldn't... (LP: #1236712)

Similar logic is also required to fix bug 1227739 for the phone, soon.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1114
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/129/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/2282
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/2167
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/126/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/mir-team-mir-development-branch-ci/129/rebuild

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

Try to ignore the failure. That's bug 1236698.

[Alexandros Frantzis (afrantzis)]

Looks good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1115
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/139/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/2298
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/2183
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/136
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/136/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/mir-team-mir-development-branch-ci/139/rebuild

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

LGTM

review: Approve

=== modified file 'include/test/mir_test_doubles/stub_compositing_criteria.h'
--- include/test/mir_test_doubles/stub_compositing_criteria.h	2013-10-07 08:34:36 +0000
+++ include/test/mir_test_doubles/stub_compositing_criteria.h	2013-10-09 07:15:52 +0000
@@ -35,10 +35,14 @@
 public:
     StubCompositingCriteria(int x, int y, int width, int height,
                             float opacity=1.0f,
-                            bool rectangular=true)
+                            bool rectangular=true,
+                            bool visible=true,
+                            bool posted=true)
         : rect{{x, y}, {width, height}},
           opacity(opacity),
-          rectangular(rectangular)
+          rectangular(rectangular),
+          visible(visible),
+          posted(posted)
     {
         const glm::mat4 ident;
         glm::vec3 size(width, height, 0.0f);
@@ -58,7 +62,7 @@
 
     bool should_be_rendered_in(const mir::geometry::Rectangle &r) const override
     {
-        return rect.overlaps(r);
+        return visible && posted && rect.overlaps(r);
     }
 
     bool shaped() const override
@@ -71,6 +75,8 @@
     glm::mat4 trans;
     float opacity;
     bool rectangular;
+    bool visible;
+    bool posted;
 };
 
 } // namespace doubles

=== modified file 'src/server/compositor/bypass.cpp'
--- src/server/compositor/bypass.cpp	2013-10-07 08:34:36 +0000
+++ src/server/compositor/bypass.cpp	2013-10-09 07:15:52 +0000
@@ -85,15 +85,9 @@
         return false;
     }
 
-    // This could be replaced by adding a "CompositingCriteria::rect()"
-    int width = trans[0][0];
-    int height = trans[1][1];
-    int x = trans[3][0] - width / 2;
-    int y = trans[3][1] - height / 2;
-    geometry::Rectangle window{{x, y}, {width, height}};
-
     // Not weirdly transformed but also not on this monitor? Don't care...
-    if (!window.overlaps(display_buffer.view_area()))
+    // This will also check the surface is not hidden and has been posted.
+    if (!criteria.should_be_rendered_in(display_buffer.view_area()))
         return false;
 
     // Transformed perfectly to fit the monitor? Bypass!

=== modified file 'tests/unit-tests/compositor/test_bypass.cpp'
--- tests/unit-tests/compositor/test_bypass.cpp	2013-10-07 08:34:36 +0000
+++ tests/unit-tests/compositor/test_bypass.cpp	2013-10-09 07:15:52 +0000
@@ -88,6 +88,26 @@
     EXPECT_FALSE(filter.fullscreen_on_top());
 }
 
+TEST_F(BypassFilterTest, hidden_fullscreen_window_not_bypassed)
+{
+    BypassFilter filter(display_buffer[0]);
+
+    StubCompositingCriteria win(0, 0, 1920, 1200, 1.0f, true, false);
+
+    EXPECT_FALSE(filter(win));
+    EXPECT_FALSE(filter.fullscreen_on_top());
+}
+
+TEST_F(BypassFilterTest, unposted_fullscreen_window_not_bypassed)
+{
+    BypassFilter filter(display_buffer[0]);
+
+    StubCompositingCriteria win(0, 0, 1920, 1200, 1.0f, true, true, false);
+
+    EXPECT_FALSE(filter(win));
+    EXPECT_FALSE(filter.fullscreen_on_top());
+}
+
 TEST_F(BypassFilterTest, shaped_fullscreen_window_not_bypassed)
 {
     BypassFilter filter(display_buffer[0]);
@@ -210,6 +230,43 @@
     EXPECT_FALSE(filter.fullscreen_on_top());
 }
 
+TEST_F(BypassFilterTest, many_fullscreen_windows_only_bypass_top_visible_posted)
+{
+    BypassFilter filter(display_buffer[0]);
+
+    StubCompositingCriteria a(0, 0, 1920, 1200, 1.0f, false);
+    EXPECT_FALSE(filter(a));
+    EXPECT_FALSE(filter.fullscreen_on_top());
+
+    StubCompositingCriteria b(1, 2, 3, 4);
+    EXPECT_FALSE(filter(b));
+    EXPECT_FALSE(filter.fullscreen_on_top());
+
+    StubCompositingCriteria c(0, 0, 1920, 1200);
+    EXPECT_TRUE(filter(c));
+    EXPECT_TRUE(filter.fullscreen_on_top());
+
+    StubCompositingCriteria d(5, 6, 7, 8);
+    EXPECT_FALSE(filter(d));
+    EXPECT_FALSE(filter.fullscreen_on_top());
+
+    StubCompositingCriteria e(0, 0, 1920, 1200, 1.0f, true, false, true);
+    EXPECT_FALSE(filter(e));
+    EXPECT_FALSE(filter.fullscreen_on_top());
+
+    StubCompositingCriteria f(0, 0, 1920, 1200, 1.0f, true, true, false);
+    EXPECT_FALSE(filter(f));
+    EXPECT_FALSE(filter.fullscreen_on_top());
+
+    StubCompositingCriteria g(9, 10, 11, 12);
+    EXPECT_FALSE(filter(g));
+    EXPECT_FALSE(filter.fullscreen_on_top());
+
+    StubCompositingCriteria h(0, 0, 1920, 1200, 1.0f, true, true, true);
+    EXPECT_TRUE(filter(h));
+    EXPECT_TRUE(filter.fullscreen_on_top());
+}
+
 TEST_F(BypassFilterTest, multimonitor_one_bypassed)
 {
     BypassFilter left(display_buffer[0]);