Merge lp:~afrantzis/mir/fix-1359487-demo-shell-visibility-events into lp:mir

[Alexandros Frantzis]

examples: Register the DemoCompositor with the Scene to properly process visibility events (LP: #1359487)

examples: Register the DemoCompositor with the Scene to properly process visibility events

[Alan Griffiths (alan-griffiths)]

Shouldn't there be a test too?

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1867
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2527/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1491
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1497
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1475/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1049
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1049/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/412
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/412/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2557/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12227

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

review: Needs Fixing (continuous-integration)

[Kevin DuBois (kdub)]

looks good, although its funny that we we could access the surface list with an id that wasn't registered...

review: Approve

[Alberto Aguirre (albaguirre)]

LGTM

review: Approve

[Daniel van Vugt (vanvugt)]

The failure (bug 1362491) appears to be unrelated to this proposal. Tested and seems to work well.

review: Approve

[Alexandros Frantzis (afrantzis)]

> looks good, although its funny that we we could access the surface list with an id that wasn't registered...

> Shouldn't there be a test too?

Both points will be addressed in upcoming MP.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'examples/demo-shell/demo_compositor.cpp'
--- examples/demo-shell/demo_compositor.cpp	2014-08-05 12:23:05 +0000
+++ examples/demo-shell/demo_compositor.cpp	2014-08-27 16:01:22 +0000
@@ -51,6 +51,12 @@
         30.0f, //titlebar_height
         80.0f) //shadow_radius
 {
+    scene->register_compositor(this);
+}
+
+me::DemoCompositor::~DemoCompositor()
+{
+    scene->unregister_compositor(this);
 }
 
 void me::DemoCompositor::composite()

=== modified file 'examples/demo-shell/demo_compositor.h'
--- examples/demo-shell/demo_compositor.h	2014-08-05 12:26:01 +0000
+++ examples/demo-shell/demo_compositor.h	2014-08-27 16:01:22 +0000
@@ -46,6 +46,7 @@
         std::shared_ptr<compositor::Scene> const& scene,
         graphics::GLProgramFactory const& factory,
         std::shared_ptr<compositor::CompositorReport> const& report);
+    ~DemoCompositor();
 
     void composite() override;