Merge lp://qastaging/~mir-team/mir/160bit-mac into lp://qastaging/~mir-team/mir/public-cookie-api
Proposed by
Brandon Schaefer
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://qastaging/~mir-team/mir/160bit-mac |
| Merge into: | lp://qastaging/~mir-team/mir/public-cookie-api |
| Diff against target: |
1243 lines (+216/-125) 40 files modified
3rd_party/android-input/android/CMakeLists.txt (+1/-0) 3rd_party/android-input/android/frameworks/base/include/androidfw/Input.h (+7/-6) 3rd_party/android-input/android/frameworks/base/include/androidfw/InputTransport.h (+4/-4) 3rd_party/android-input/android/frameworks/base/services/input/Input.cpp (+2/-2) 3rd_party/android-input/android/frameworks/base/services/input/InputListener.h (+4/-4) 3rd_party/android-input/android/frameworks/base/services/input/InputTransport.cpp (+6/-6) include/client/mir/events/event_builders.h (+20/-2) include/cookie/mir/cookie_authority.h (+2/-1) src/client/CMakeLists.txt (+1/-0) src/client/events/event_builders.cpp (+40/-12) src/client/input/android/android_input_lexicon.cpp (+3/-3) src/client/mir_surface.cpp (+1/-1) src/cookie/CMakeLists.txt (+4/-1) src/cookie/cookie.cpp (+41/-0) src/cookie/cookie_authority.cpp (+8/-14) src/cookie/symbols.map (+10/-0) src/include/common/mir/events/event_private.h (+3/-4) src/include/cookie/mir/cookie.h (+20/-1) src/protobuf/mir_protobuf.proto (+1/-1) src/server/CMakeLists.txt (+1/-0) src/server/frontend/session_mediator.cpp (+1/-3) src/server/input/default_event_builder.cpp (+5/-8) src/server/input/key_repeat_dispatcher.cpp (+1/-1) src/server/input/validator.cpp (+1/-1) tests/acceptance-tests/test_client_input.cpp (+1/-1) tests/integration-tests/CMakeLists.txt (+1/-0) tests/mir_test_doubles/CMakeLists.txt (+1/-0) tests/unit-tests/client/input/test_android_input_receiver.cpp (+2/-2) tests/unit-tests/client/input/test_xkb_mapper.cpp (+1/-2) tests/unit-tests/frontend/test_event_sender.cpp (+1/-2) tests/unit-tests/input/android/test_android_input_lexicon.cpp (+3/-7) tests/unit-tests/input/android/test_android_input_sender.cpp (+1/-1) tests/unit-tests/input/test_event_builders.cpp (+1/-6) tests/unit-tests/input/test_event_filter_chain_dispatcher.cpp (+1/-1) tests/unit-tests/input/test_key_repeat_dispatcher.cpp (+2/-2) tests/unit-tests/input/test_surface_input_dispatcher.cpp (+10/-10) tests/unit-tests/input/test_validator.cpp (+1/-1) tests/unit-tests/scene/test_abstract_shell.cpp (+1/-1) tests/unit-tests/scene/test_surface.cpp (+2/-2) tests/unit-tests/test_mir_cookie.cpp (+0/-12) |
| To merge this branch: | bzr merge lp://qastaging/~mir-team/mir/160bit-mac |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Kevin DuBois (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Moves from 64bit macs to 160bit macs
Description of the change
Moves from 64bit macs to 160bit macs
To post a comment you must log in.
Unmerged revisions
- 3261. By Brandon Schaefer
-
* Let the compiler know these functions are pure
- 3260. By Brandon Schaefer
-
* Move to 160bits for the MAC
- 3259. By Brandon Schaefer
-
* Fix new test from trunk!
- 3258. By Brandon Schaefer
-
* Merge trunk
- 3257. By Brandon Schaefer
-
* Move to using MirCookie* vs void*
- 3256. By Brandon Schaefer
-
* Rename CookieFactory -> CookieAuthority
- 3255. By Brandon Schaefer
-
* Opps missed debian/control change to libmircookie1->2
- 3254. By Brandon Schaefer
-
* Update libmircookie to 1 -> 2
- 3253. By Brandon Schaefer
-
* Expose the mutex and remove getter functions. Simplifies tests
- 3252. By Brandon Schaefer
-
* Use a reference once we get the pointer
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
lgtm, given that we can probably 'get away with' changing the mircookie protocol at this stage. I also think that a case could be made for mir::cookie::Mac being its own class, but alright as is too.