Mir

Merge lp:~alan-griffiths/mir/fix-1308133 into lp:mir

  1. fix-1308133
  2. Merge into development-branch
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:~alan-griffiths/mir/fix-1308133
Merge into: lp:mir
Prerequisite: lp:~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:~alan-griffiths/mir/fix-1308133
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.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.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:2977
http://jenkins.qa.ubuntu.com/job/mir-ci/5061/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4180
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3087
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4122
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/80/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1212
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1212/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/80/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4123
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4123/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6802
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23766
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/81/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5061/rebuild

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

Looks good.

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

Oh wow. Such a silly mistake.

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

Confirmed; this fixes the missing cursor in Xmir. In fact this fixes it better than the workaround I have in Xmir.

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