Mir

Merge lp://qastaging/~vanvugt/mir/resize-BufferBundle into lp://qastaging/mir

  1. resize-BufferBundle
  2. Merge into development-branch
Proposed by Daniel van Vugt
Status: Merged
Approved by: Daniel van Vugt
Approved revision: no longer in the source branch.
Merged at revision: 1184
Proposed branch: lp://qastaging/~vanvugt/mir/resize-BufferBundle
Merge into: lp://qastaging/mir
Prerequisite: lp://qastaging/~vanvugt/mir/StubBuffer-remembers-properties
Diff against target: 197 lines (+113/-1)
6 files modified
include/test/mir_test_doubles/mock_buffer_bundle.h (+1/-0)
src/server/compositor/buffer_bundle.h (+1/-0)
src/server/compositor/switching_bundle.cpp (+15/-0)
src/server/compositor/switching_bundle.h (+9/-1)
tests/unit-tests/compositor/test_switching_bundle.cpp (+86/-0)
tests/unit-tests/surfaces/test_surface_stack.cpp (+1/-0)
To merge this branch: bzr merge lp://qastaging/~vanvugt/mir/resize-BufferBundle
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Alexandros Frantzis (community) Approve
Kevin DuBois (community) Approve
Review via email: mp+193203@code.qastaging.launchpad.net

Commit message

Add resize() support to BufferBundle. This is the first step and lowest level
of surface resize support.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1184
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/293/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/22
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/22/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/22
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/22/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/mir-team-mir-development-branch-ci/293/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

46 +void mc::SwitchingBundle::resize(const geometry::Size &newsize)
47 +{
48 + bundle_properties.size = newsize;
49 +}

We should guard this with a lock, since bundle_properties is not immutable any more.
The same applies to mc::SwitchingBundle::properties(), and also for allow_framedropping(),
framedropping_allowed() (existing problem).

review: Needs Fixing
Revision history for this message
Kevin DuBois (kdub) wrote :

apart from the locking, looks good to me. will 'pre-approve'

review: Approve
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Thanks for catching that. Locking added.

There is an argument that simple setting and getting of bools is "atomic enough" and that they don't need to be locked. But I think we should lock them, if for no other reason than to keep the helgrind warnings down.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1187
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/297/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/63
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/62/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/26
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/26/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/26
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/26/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/mir-team-mir-development-branch-ci/297/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Ignore the clang failure. That's bug 1246590.

Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

Looks good.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches