Merge lp://staging/~alan-griffiths/mir/fix-1308133 into lp://staging/mir
Proposed by
Alan Griffiths
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | Daniel van Vugt | ||||||||
Approved revision: | no longer in the source branch. | ||||||||
Merged at revision: | 2980 | ||||||||
Proposed branch: | lp://staging/~alan-griffiths/mir/fix-1308133 | ||||||||
Merge into: | lp://staging/mir | ||||||||
Prerequisite: | lp://staging/~alan-griffiths/mir/make-cursors-less-broken | ||||||||
Diff against target: |
220 lines (+74/-68) 4 files modified
examples/animated_cursor_demo_client.c (+3/-1) src/server/graphics/nested/mir_client_host_connection.cpp (+0/-6) src/server/scene/basic_surface.cpp (+70/-60) src/server/scene/basic_surface.h (+1/-1) |
||||||||
To merge this branch: | bzr merge lp://staging/~alan-griffiths/mir/fix-1308133 | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel van Vugt | Approve | ||
Alexandros Frantzis (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email: mp+272819@code.staging.launchpad.net |
Commit message
scene: use the cursor stream for a surface correctly by extracting frames for "composition", not "snapshotting" the last composited frame.
(LP: #1308133)
Description of the change
scene: use the cursor stream for a surface correctly by extracting frames for "composition", not "snapshotting" the last composited frame.
To post a comment you must log in.
PASSED: Continuous integration, rev:2977 jenkins. qa.ubuntu. com/job/ mir-ci/ 5061/ jenkins. qa.ubuntu. com/job/ mir-android- vivid-i386- build/4180 jenkins. qa.ubuntu. com/job/ mir-clang- vivid-amd64- build/3087 jenkins. qa.ubuntu. com/job/ mir-mediumtests -vivid- touch/4122 jenkins. qa.ubuntu. com/job/ mir-mediumtests -wily-touch/ 80/console jenkins. qa.ubuntu. com/job/ mir-wily- amd64-ci/ 1212 jenkins. qa.ubuntu. com/job/ mir-wily- amd64-ci/ 1212/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-wily- i386-ci/ 80/console jenkins. qa.ubuntu. com/job/ mir-mediumtests -builder- vivid-armhf/ 4123 jenkins. qa.ubuntu. com/job/ mir-mediumtests -builder- vivid-armhf/ 4123/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-mediumtests -runner- mako/6802 s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 23766 jenkins. qa.ubuntu. com/job/ mir-mediumtests -builder- wily-armhf/ 81/console
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/mir- ci/5061/ rebuild
http://