Merge lp://staging/~vanvugt/mir/parenting-server-api into lp://staging/mir
Proposed by
Daniel van Vugt
Status: | Rejected |
---|---|
Rejected by: | Cemil Azizoglu |
Proposed branch: | lp://staging/~vanvugt/mir/parenting-server-api |
Merge into: | lp://staging/mir |
Diff against target: |
498 lines (+191/-10) 21 files modified
client-ABI-sha1sums (+1/-1) common-ABI-sha1sums (+1/-1) include/common/mir_toolkit/common.h (+6/-0) include/server/mir/frontend/session.h (+2/-0) include/server/mir/frontend/surface.h (+3/-0) platform-ABI-sha1sums (+1/-1) server-ABI-sha1sums (+3/-3) src/server/frontend/session_mediator.cpp (+1/-2) src/server/scene/application_session.cpp (+17/-0) src/server/scene/application_session.h (+1/-0) src/server/scene/basic_surface.cpp (+37/-0) src/server/scene/basic_surface.h (+5/-0) tests/include/mir_test_doubles/mock_frontend_surface.h (+3/-0) tests/include/mir_test_doubles/mock_surface.h (+3/-0) tests/include/mir_test_doubles/stub_scene_session.h (+4/-0) tests/include/mir_test_doubles/stub_scene_surface.h (+2/-0) tests/include/mir_test_doubles/stub_session.h (+4/-0) tests/unit-tests/client/test_client_mir_surface.cpp (+2/-1) tests/unit-tests/scene/test_application_session.cpp (+46/-0) tests/unit-tests/scene/test_basic_surface.cpp (+14/-1) tests/unit-tests/scene/test_surface_impl.cpp (+35/-0) |
To merge this branch: | bzr merge lp://staging/~vanvugt/mir/parenting-server-api |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Cemil Azizoglu (community) | Needs Resubmitting | ||
Robert Carr (community) | Disapprove | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Alberto Aguirre (community) | Abstain | ||
Alan Griffiths | Needs Resubmitting | ||
Review via email:
|
This proposal supersedes a proposal from 2014-11-03.
Commit message
Introduce basic surface parent information in the server API.
Description of the change
Server ABI broken, but we have already bumped it for this series.
To post a comment you must log in.
Unmerged revisions
- 2043. By Daniel van Vugt
-
Merge latest trunk
- 2042. By Daniel van Vugt
-
Merge latest trunk
- 2041. By Daniel van Vugt
-
Merge latest trunk
- 2040. By Daniel van Vugt
-
Tidy up ApplicationSession unit-tests' mocks.
- 2039. By Daniel van Vugt
-
Merge latest trunk and fix conflicts.
- 2038. By Daniel van Vugt
-
Merge latest trunk
- 2037. By Daniel van Vugt
-
Merge latest trunk
- 2036. By Daniel van Vugt
-
Add a dummy expectation to silence gmock (part of LP: #1390312)
- 2035. By Daniel van Vugt
-
Merge latest trunk
- 2034. By Daniel van Vugt
-
Also verify that configure_surface() gives the correct shared_ptr to
set_parent().
PASSED: Continuous integration, rev:2026 jenkins. qa.ubuntu. com/job/ mir-ci/ 1985/ jenkins. qa.ubuntu. com/job/ mir-android- utopic- i386-build/ 2352 jenkins. qa.ubuntu. com/job/ mir-clang- utopic- amd64-build/ 2362 jenkins. qa.ubuntu. com/job/ mir-mediumtests -utopic- touch/2287 jenkins. qa.ubuntu. com/job/ mir-utopic- amd64-ci/ 331 jenkins. qa.ubuntu. com/job/ mir-utopic- amd64-ci/ 331/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-mediumtests -builder- utopic- armhf/1224 jenkins. qa.ubuntu. com/job/ mir-mediumtests -builder- utopic- armhf/1224/ artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-mediumtests -runner- mako/3259 s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 15400
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/mir- ci/1985/ rebuild
http://