Merge lp:~unity-team/qtmir/revert-occlusion-detection into lp:qtmir

[Nick Dedekind]

Reverted occlusion detection (lp#1514556)

Reverted occlusion detection (lp#1514556)

related qtubuntu branch:
https://code.launchpad.net/~unity-team/qtubuntu/revert-occlusion-detection/+merge/277048

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:405
http://jenkins.qa.ubuntu.com/job/qtmir-ci/554/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/250/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/250/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/132/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/287/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/287/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/132/console

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

review: Needs Fixing (continuous-integration)

[lp:~unity-team/qtmir/revert-occlusion-detection]

406. By Nick Dedekind on 2015-11-10

remove visibility tests

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:406
http://jenkins.qa.ubuntu.com/job/qtmir-ci/555/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/251
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/251
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/251/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/133
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/288/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/288/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/133/console

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

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

Will do until core issue determined

review: Approve

=== modified file 'src/modules/Unity/Application/mirsurfaceitem.cpp'
--- src/modules/Unity/Application/mirsurfaceitem.cpp	2015-10-26 18:29:24 +0000
+++ src/modules/Unity/Application/mirsurfaceitem.cpp	2015-11-10 09:04:49 +0000
@@ -531,7 +531,8 @@
         return;
     }
 
-    m_surface->setViewVisibility((qintptr)this, isVisible());
+    // FIXME: https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1514556
+    // m_surface->setViewVisibility((qintptr)this, isVisible());
 }
 
 void MirSurfaceItem::updateMirSurfaceFocus(bool focused)

=== modified file 'tests/modules/SurfaceManager/mirsurfaceitem_test.cpp'
--- tests/modules/SurfaceManager/mirsurfaceitem_test.cpp	2015-10-20 10:04:36 +0000
+++ tests/modules/SurfaceManager/mirsurfaceitem_test.cpp	2015-11-10 09:04:49 +0000
@@ -100,7 +100,7 @@
     delete fakeSurface;
 }
 
-TEST_F(MirSurfaceItemTest, SetSurfaceInitializesVisiblity)
+TEST_F(MirSurfaceItemTest, DISABLED_SetSurfaceInitializesVisiblity)
 {
     MirSurfaceItem *surfaceItem = new MirSurfaceItem;
     surfaceItem->setVisible(false);
@@ -114,7 +114,7 @@
     delete fakeSurface;
 }
 
-TEST_F(MirSurfaceItemTest, AggregateSurfaceVisibility)
+TEST_F(MirSurfaceItemTest, DISABLED_ggregateSurfaceVisibility)
 {
     MirSurfaceItem *surfaceItem1 = new MirSurfaceItem;
     surfaceItem1->setVisible(true);