Merge lp:~albaguirre/mir/fix-1350961 into lp:mir

[Alberto Aguirre]

Release overlay buffers when screen is turned off (LP: #1350961)

Release overlay buffers when screen is turned off (LP: #1350961)

[Kevin DuBois (kdub)]

Small preference for having the derived class call the base class, but looks good to me.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1809
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2284/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1160
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1166
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1148
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/806
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/806/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/807
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/807/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/83
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/83/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2271
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10807

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

review: Approve (continuous-integration)

=== modified file 'src/platform/graphics/android/hwc_common_device.cpp'
--- src/platform/graphics/android/hwc_common_device.cpp	2014-07-22 03:26:35 +0000
+++ src/platform/graphics/android/hwc_common_device.cpp	2014-07-31 19:11:18 +0000
@@ -124,10 +124,15 @@
     hwc_device->vsync_signal_on();
 }
 
-void mga::HWCCommonDevice::turn_screen_off() const
+void mga::HWCCommonDevice::turn_screen_off()
 {
     hwc_device->vsync_signal_off();
     hwc_device->display_off();
+    turned_screen_off();
+}
+
+void mga::HWCCommonDevice::turned_screen_off()
+{
 }
 
 bool mga::HWCCommonDevice::apply_orientation(MirOrientation) const

=== modified file 'src/platform/graphics/android/hwc_common_device.h'
--- src/platform/graphics/android/hwc_common_device.h	2014-06-25 22:22:45 +0000
+++ src/platform/graphics/android/hwc_common_device.h	2014-07-31 19:11:18 +0000
@@ -60,7 +60,8 @@
 
 private:
     void turn_screen_on() const;
-    void turn_screen_off() const;
+    void turn_screen_off();
+    virtual void turned_screen_off();
 
     HWCCallbacks callbacks;
 

=== modified file 'src/platform/graphics/android/hwc_device.cpp'
--- src/platform/graphics/android/hwc_device.cpp	2014-07-11 19:28:07 +0000
+++ src/platform/graphics/android/hwc_device.cpp	2014-07-31 19:11:18 +0000
@@ -173,3 +173,8 @@
     mir::Fd retire_fd(hwc_list.retirement_fence());
     return true;
 }
+
+void mga::HwcDevice::turned_screen_off()
+{
+    onscreen_overlay_buffers.clear();
+}

=== modified file 'src/platform/graphics/android/hwc_device.h'
--- src/platform/graphics/android/hwc_device.h	2014-07-09 14:36:49 +0000
+++ src/platform/graphics/android/hwc_device.h	2014-07-31 19:11:18 +0000
@@ -52,6 +52,7 @@
         RenderableListCompositor const& list_compositor);
 
 private:
+    void turned_screen_off() override;
     LayerList hwc_list;
     std::vector<std::shared_ptr<Buffer>> onscreen_overlay_buffers;
 

=== modified file 'tests/unit-tests/graphics/android/test_hwc_device.cpp'
--- tests/unit-tests/graphics/android/test_hwc_device.cpp	2014-07-11 19:58:53 +0000
+++ tests/unit-tests/graphics/android/test_hwc_device.cpp	2014-07-31 19:11:18 +0000
@@ -567,3 +567,19 @@
     mg::RenderableList renderlist{std::make_shared<mtd::PlaneAlphaRenderable>()};
     EXPECT_FALSE(device.post_overlays(stub_context, renderlist, stub_compositor));
 }
+
+TEST_F(HwcDevice, does_not_own_overlay_buffers_after_screen_off)
+{
+    using namespace testing;
+    EXPECT_CALL(*mock_device, prepare(_))
+        .WillOnce(Invoke(set_all_layers_to_overlay));
+
+    mga::HwcDevice device(mock_device, mock_vsync, mock_file_ops);
+
+    auto use_count_before = stub_buffer1.use_count();
+    EXPECT_TRUE(device.post_overlays(stub_context, {stub_renderable1}, stub_compositor));
+    EXPECT_THAT(stub_buffer1.use_count(), Gt(use_count_before));
+
+    device.mode(MirPowerMode::mir_power_mode_off);
+    EXPECT_THAT(stub_buffer1.use_count(), Eq(use_count_before));
+}