Merge lp:~compiz-team/compiz/compiz.fix_1171314 into lp:compiz/0.9.10
Status: | Merged |
---|---|
Approved by: | Sam Spilsbury |
Approved revision: | 3748 |
Merged at revision: | 3763 |
Proposed branch: | lp:~compiz-team/compiz/compiz.fix_1171314 |
Merge into: | lp:compiz/0.9.10 |
Diff against target: |
771 lines (+542/-71) 10 files modified
src/privatewindow.h (+1/-0) src/window.cpp (+40/-54) tests/system/xorg-gtest/tests/compiz_xorg_gtest_configure_window.cpp (+1/-15) tests/system/xorg-gtest/tests/compiz_xorg_gtest_test_window_stacking.cpp (+403/-0) tests/xorg-gtest/communicator/compiz_xorg_gtest_communicator.cpp (+5/-1) tests/xorg-gtest/communicator/compiz_xorg_gtest_communicator.h (+2/-0) tests/xorg-gtest/include/compiz-xorg-gtest.h (+2/-0) tests/xorg-gtest/plugins/testhelper/src/testhelper.cpp (+61/-1) tests/xorg-gtest/plugins/testhelper/src/testhelper.h (+6/-0) tests/xorg-gtest/src/compiz-xorg-gtest.cpp (+21/-0) |
To merge this branch: | bzr merge lp:~compiz-team/compiz/compiz.fix_1171314 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
MC Return | Approve | ||
Review via email: mp+171669@code.launchpad.net |
This proposal supersedes a proposal from 2013-06-26.
Commit message
Don't add the frame to the toplevel stack if it hasn't been created yet.
In the event that a window is unreparented or destroyed, we usually need
to add its frame window to the toplevel window stack until the time at
which we recieve a DestroyNotify for it, as there may be incoming
ConfigureNotify events puporting to stack other windows relative to
that frame.
However, this does not apply in the case where we have not yet received
a CreateNotify for the frame window. In that case, it is not possible
for any stacking requests to be made relative to this window, so it
does not need to be added immediately. Instead, we can add it at the
time that we recieve a CreateNotify for it as a regular override
redirect window until the time that it is later destroyed.
(LP: #1171314)
Description of the change
Don't add the frame to the toplevel stack if it hasn't been created yet.
In the event that a window is unreparented or destroyed, we usually need
to add its frame window to the toplevel window stack until the time at
which we recieve a DestroyNotify for it, as there may be incoming
ConfigureNotify events puporting to stack other windows relative to
that frame.
However, this does not apply in the case where we have not yet received
a CreateNotify for the frame window. In that case, it is not possible
for any stacking requests to be made relative to this window, so it
does not need to be added immediately. Instead, we can add it at the
time that we recieve a CreateNotify for it as a regular override
redirect window until the time that it is later destroyed.
(LP: #1171314)
FAILED: Continuous integration, rev:3747 jenkins. qa.ubuntu. com/job/ compiz- ci/215/ jenkins. qa.ubuntu. com/job/ compiz- gles-ci/ ./build= pbuilder, distribution= raring, flavor= amd64/256/ console jenkins. qa.ubuntu. com/job/ compiz- saucy-amd64- ci/28 jenkins. qa.ubuntu. com/job/ compiz- saucy-armhf- ci/28 jenkins. qa.ubuntu. com/job/ compiz- saucy-i386- ci/28
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ compiz- ci/215/ rebuild
http://