Mir

Merge lp://qastaging/~afrantzis/mir/display-config-api-use-base-config into lp://qastaging/mir

  1. display-config-api-use-base-config
  2. Merge into development-branch
Proposed by Alexandros Frantzis
Status: Merged
Approved by: Alan Griffiths
Approved revision: no longer in the source branch.
Merged at revision: 3051
Proposed branch: lp://qastaging/~afrantzis/mir/display-config-api-use-base-config
Merge into: lp://qastaging/mir
Diff against target: 443 lines (+75/-109)
14 files modified
src/include/server/mir/frontend/display_changer.h (+1/-1)
src/server/frontend/session_mediator.cpp (+3/-3)
src/server/frontend/unauthorized_display_changer.cpp (+2/-2)
src/server/frontend/unauthorized_display_changer.h (+1/-1)
src/server/scene/mediating_display_changer.cpp (+9/-13)
src/server/scene/mediating_display_changer.h (+2/-2)
tests/acceptance-tests/test_nested_mir.cpp (+0/-74)
tests/include/mir/test/doubles/mock_display_changer.h (+1/-1)
tests/include/mir/test/doubles/null_display_changer.h (+1/-1)
tests/integration-tests/test_client_screencast.cpp (+1/-1)
tests/integration-tests/test_large_messages.cpp (+1/-1)
tests/unit-tests/frontend/test_session_mediator.cpp (+4/-4)
tests/unit-tests/frontend/test_unauthorized_display_changer.cpp (+2/-2)
tests/unit-tests/scene/test_mediating_display_changer.cpp (+47/-3)
To merge this branch: bzr merge lp://qastaging/~afrantzis/mir/display-config-api-use-base-config
Reviewer Review Type Date Requested Status
Alan Griffiths Approve
PS Jenkins bot (community) continuous-integration Approve
Kevin DuBois (community) Approve
Review via email: mp+275160@code.qastaging.launchpad.net

Commit message

frontend,scene: Use the base configuration for all display configuration queries and notifications

Description of the change

frontend,scene: Use the base configuration for all display configuration queries and notifications

This restores the intended behavior of the client API display configuration functions, which is also the behavior that we want for the reworked API.

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

FAILED: Continuous integration, rev:3044
http://jenkins.qa.ubuntu.com/job/mir-ci/5352/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4565
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3472
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4507/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/465/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1506
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1506/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/465
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/465/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4508
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4508/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7140/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24418
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/466/console

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

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

CI failure is https://bugs.launchpad.net/mir/+bug/1506137. Rebuilding.

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

- virtual std::shared_ptr<graphics::DisplayConfiguration> active_configuration() = 0;
still seems useful to have the active_configuration accessible through this interface. I guess this is a private interface though, and can easily be added back if needed. other changes lgtm

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

FAILED: Continuous integration, rev:3044
http://jenkins.qa.ubuntu.com/job/mir-ci/5357/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4571
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3478
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4513/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/471/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1511
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1511/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/471
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/471/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4514
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4514/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7145/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24426
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/472/console

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

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

PASSED: Continuous integration, rev:3044
http://jenkins.qa.ubuntu.com/job/mir-ci/5366/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4589
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3496
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4531
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/489/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1520
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1520/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/489
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/489/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4532
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4532/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7162
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24464
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/490/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5366/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