Mir

Merge lp:~vanvugt/mir/remove-BasicSurface-buffer_stream into lp:mir

Proposed by Daniel van Vugt
Status: Merged
Approved by: Alan Griffiths
Approved revision: no longer in the source branch.
Merged at revision: 3871
Proposed branch: lp:~vanvugt/mir/remove-BasicSurface-buffer_stream
Merge into: lp:mir
Diff against target: 28 lines (+0/-7)
2 files modified
src/server/scene/basic_surface.cpp (+0/-5)
src/server/scene/basic_surface.h (+0/-2)
To merge this branch: bzr merge lp:~vanvugt/mir/remove-BasicSurface-buffer_stream
Reviewer Review Type Date Requested Status
Alan Griffiths Approve
Cemil Azizoglu (community) Approve
Mir CI Bot continuous-integration Approve
Review via email: mp+312625@code.launchpad.net

Commit message

Remove dead code BasicSurface::buffer_stream()

To post a comment you must log in.
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:3870
https://mir-jenkins.ubuntu.com/job/mir-ci/2333/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/3043
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3109
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3101
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3101
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/3101
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/3072
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/3072/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3072
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3072/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/3072
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/3072/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3072
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3072/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3072
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3072/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3072
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3072/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/2333/rebuild

review: Approve (continuous-integration)
Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

ok

review: Approve
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

ack

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/server/scene/basic_surface.cpp'
--- src/server/scene/basic_surface.cpp 2016-11-16 13:24:41 +0000
+++ src/server/scene/basic_surface.cpp 2016-12-07 07:59:13 +0000
@@ -272,11 +272,6 @@
272 report->surface_deleted(this, surface_name);272 report->surface_deleted(this, surface_name);
273}273}
274274
275std::shared_ptr<mc::BufferStream> ms::BasicSurface::buffer_stream() const
276{
277 return surface_buffer_stream;
278}
279
280std::string ms::BasicSurface::name() const275std::string ms::BasicSurface::name() const
281{276{
282 return surface_name;277 return surface_name;
283278
=== modified file 'src/server/scene/basic_surface.h'
--- src/server/scene/basic_surface.h 2016-10-31 02:37:31 +0000
+++ src/server/scene/basic_surface.h 2016-12-07 07:59:13 +0000
@@ -103,8 +103,6 @@
103103
104 void set_input_region(std::vector<geometry::Rectangle> const& input_rectangles) override;104 void set_input_region(std::vector<geometry::Rectangle> const& input_rectangles) override;
105105
106 std::shared_ptr<compositor::BufferStream> buffer_stream() const;
107
108 void resize(geometry::Size const& size) override;106 void resize(geometry::Size const& size) override;
109 geometry::Point top_left() const override;107 geometry::Point top_left() const override;
110 geometry::Rectangle input_bounds() const override;108 geometry::Rectangle input_bounds() const override;

Subscribers

People subscribed via source and target branches