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

[Daniel van Vugt]

Avoid accidentally staying in bypass mode when a non-bypassable translucent
surface is on top. (LP: #1266385)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1312
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/612/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/562
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/558
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/166
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/338
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/338/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/341
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/341/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/166
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/166/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/191
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2720

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

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

LGTM

review: Approve

[Kevin DuBois (kdub)]

review: Approve

=== modified file 'src/server/compositor/bypass.cpp'
--- src/server/compositor/bypass.cpp	2013-12-18 02:19:19 +0000
+++ src/server/compositor/bypass.cpp	2014-01-06 09:16:59 +0000
@@ -57,9 +57,6 @@
 
 bool BypassFilter::operator()(const CompositingCriteria &criteria)
 {
-    if (criteria.alpha() != 1.0f || criteria.shaped())
-        return false;
-
     if (!all_orthogonal)
         return false;
 
@@ -90,6 +87,11 @@
     if (!criteria.should_be_rendered_in(display_buffer.view_area()))
         return false;
 
+    topmost_fits = false;
+
+    if (criteria.alpha() != 1.0f || criteria.shaped())
+        return false;
+
     // Transformed perfectly to fit the monitor? Bypass!
     topmost_fits = criteria.transformation() == fullscreen;
     return topmost_fits;

=== modified file 'tests/unit-tests/compositor/test_bypass.cpp'
--- tests/unit-tests/compositor/test_bypass.cpp	2013-10-15 08:53:10 +0000
+++ tests/unit-tests/compositor/test_bypass.cpp	2014-01-06 09:16:59 +0000
@@ -140,6 +140,18 @@
     EXPECT_FALSE(filter.fullscreen_on_top());
 }
 
+TEST_F(BypassFilterTest, translucently_obscured_fullscreen_window_not_bypassed)
+{   // Regression test for LP: #1266385
+    BypassFilter filter(display_buffer[0]);
+
+    StubCompositingCriteria fs(0, 0, 1920, 1200);
+    StubCompositingCriteria small(20, 30, 40, 50, 0.5f);
+
+    EXPECT_TRUE(filter(fs));
+    EXPECT_FALSE(filter(small));
+    EXPECT_FALSE(filter.fullscreen_on_top());
+}
+
 TEST_F(BypassFilterTest, unobscured_fullscreen_window_bypassed)
 {
     BypassFilter filter(display_buffer[0]);