Mir

Merge lp://qastaging/~vanvugt/mir/fix-1236712 into lp://qastaging/mir

  1. fix-1236712
  2. Merge into development-branch
Proposed by Daniel van Vugt
Status: Merged
Approved by: Alan Griffiths
Approved revision: no longer in the source branch.
Merged at revision: 1122
Proposed branch: lp://qastaging/~vanvugt/mir/fix-1236712
Merge into: lp://qastaging/mir
Diff against target: 135 lines (+68/-11)
3 files modified
include/test/mir_test_doubles/stub_compositing_criteria.h (+9/-3)
src/server/compositor/bypass.cpp (+2/-8)
tests/unit-tests/compositor/test_bypass.cpp (+57/-0)
To merge this branch: bzr merge lp://qastaging/~vanvugt/mir/fix-1236712
Reviewer Review Type Date Requested Status
Alan Griffiths Approve
PS Jenkins bot (community) continuous-integration Approve
Alexandros Frantzis (community) Approve
Review via email: mp+189768@code.qastaging.launchpad.net

Commit message

BypassFilter: Remember to check that a surface is not hidden and has had a
buffer posted before allowing it to be bypassed. Or else you will see
something you shouldn't... (LP: #1236712)

Description of the change

Similar logic is also required to fix bug 1227739 for the phone, soon.

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

FAILED: Continuous integration, rev:1114
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/129/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/2282
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/2167
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/126/console

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

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

Try to ignore the failure. That's bug 1236698.

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

Looks good.

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

PASSED: Continuous integration, rev:1115
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/139/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/2298
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/2183
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/136
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/136/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/139/rebuild

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

LGTM

review: Approve

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