Merge lp://staging/~sil2100/compiz-core/cherry_rev3137 into lp://staging/compiz-core
Status: | Merged |
---|---|
Merged at revision: | 3103 |
Proposed branch: | lp://staging/~sil2100/compiz-core/cherry_rev3137 |
Merge into: | lp://staging/compiz-core |
Diff against target: |
1474 lines (+856/-67) 15 files modified
gtk/window-decorator/decorator.c (+55/-25) gtk/window-decorator/events.c (+12/-1) gtk/window-decorator/gtk-window-decorator.c (+9/-0) gtk/window-decorator/gtk-window-decorator.h (+8/-0) gtk/window-decorator/wnck.c (+13/-11) include/decoration.h (+18/-0) libdecoration/decoration.c (+86/-0) plugins/decor/CMakeLists.txt (+3/-1) plugins/decor/src/decor.cpp (+99/-22) plugins/decor/src/decor.h (+35/-7) plugins/decor/src/pixmap-requests/CMakeLists.txt (+62/-0) plugins/decor/src/pixmap-requests/include/pixmap-requests.h (+188/-0) plugins/decor/src/pixmap-requests/src/pixmap-requests.cpp (+93/-0) plugins/decor/src/pixmap-requests/tests/CMakeLists.txt (+15/-0) plugins/decor/src/pixmap-requests/tests/pixmap-requests/src/test-decor-pixmap-requests.cpp (+160/-0) |
To merge this branch: | bzr merge lp://staging/~sil2100/compiz-core/cherry_rev3137 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel van Vugt | Approve | ||
Review via email:
|
Description of the change
Cherry picked from 0.9.8 branch:
Add synchronization primitives to the decoration protocol so that there isn't a race where we bind a texture that's being freed.
Things changed
* update_
* decor_post_pending : tells the decorated process that a new decoration is pending
* decor_post_request : tells the decorator that a new pixmap can be drawn to
* decor_post_
I also did some necessary refactoring so we could get this under test, namely:
DecorPixmap class (implements DecorPixmapInte
X11DecorPixmapR
X11DecorPixmapR
X11PixmapDeletor class (implements DecorPixmapDele
DecorationListF
DecorationInter
Tests included (Google Mock)
Resubmitted to cover a potential race condition in LP#996901
I assume the ABI changes here don't affect Unity builds?... Better to ask a silly question now than later :)