Merge lp://qastaging/~vanvugt/mir/simplify-alpha into lp://qastaging/mir
Proposed by
Daniel van Vugt
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Daniel van Vugt | ||||
| Approved revision: | no longer in the source branch. | ||||
| Merged at revision: | 1948 | ||||
| Proposed branch: | lp://qastaging/~vanvugt/mir/simplify-alpha | ||||
| Merge into: | lp://qastaging/mir | ||||
| Diff against target: |
257 lines (+8/-41) 14 files modified
debian/changelog (+1/-0) include/platform/mir/graphics/renderable.h (+0/-1) platform-ABI-sha1sums (+1/-1) playground/render_overlays.cpp (+0/-5) server-ABI-sha1sums (+1/-1) src/platform/graphics/android/hwc_device.cpp (+1/-1) src/platform/graphics/android/hwc_fallback_gl_renderer.cpp (+1/-1) src/platform/graphics/android/hwc_layerlist.cpp (+2/-2) src/platform/symbols.map (+0/-1) src/server/input/touchspot_controller.cpp (+0/-5) src/server/scene/basic_surface.cpp (+0/-8) tests/include/mir_test_doubles/fake_renderable.h (+0/-5) tests/include/mir_test_doubles/mock_renderable.h (+0/-1) tests/include/mir_test_doubles/stub_renderable.h (+1/-9) |
||||
| To merge this branch: | bzr merge lp://qastaging/~vanvugt/mir/simplify-alpha | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel van Vugt | Approve | ||
| Kevin DuBois (community) | Approve | ||
| Alberto Aguirre (community) | Approve | ||
| PS Jenkins bot (community) | continuous-integration | Approve | |
|
Review via email:
|
|||
Commit message
Simplify alpha-related attributes, removing the recently added
alpha_enabled(). It adds no functionality that's not already
available via alpha() or shaped(). So drop it.
As a bonus, this also fixes LP: #1373698.
Description of the change
The two ABI breaks have already been bumped in the current 0.8 series. No further bump required.
To post a comment you must log in.
Revision history for this message
| Daniel van Vugt (vanvugt) wrote | # |
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| Daniel van Vugt (vanvugt) wrote | # |
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| Daniel van Vugt (vanvugt) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
I just noticed I had accidentally fixed too much in hwc_device.cpp, which stopped nested servers from overlaying. Now un-fixed hwc_device.cpp so it at least has the same old bug as before ("FIXME"), and overlays will still work :S