Merge lp:~compiz-team/compiz-core/compiz-core.fix_860286 into lp:compiz-core/0.9.5

Proposed by Sam Spilsbury on 2011-09-27
Status: Merged
Merged at revision: 2839
Proposed branch: lp:~compiz-team/compiz-core/compiz-core.fix_860286
Merge into: lp:compiz-core/0.9.5
Diff against target: 81 lines (+16/-9) 2 files modified
To merge this branch: bzr merge lp:~compiz-team/compiz-core/compiz-core.fix_860286
Reviewer Review Type Date Requested Status
Robert Carr 2011-09-27 Approve on 2011-09-27
Review via email: mp+77151@code.launchpad.net

Description of the Change

To post a comment you must log in.
Robert Carr (robertcarr) wrote :

+1

review: Approve

Preview Diff

1=== modified file 'plugins/composite/src/window.cpp'
2--- plugins/composite/src/window.cpp 2011-09-19 12:54:22 +0000
3+++ plugins/composite/src/window.cpp 2011-09-27 11:57:56 +0000
4@@ -268,7 +268,7 @@
5 return;
6
7 if (priv->window->shaded () ||
8- (priv->window->isViewable () && priv->damaged))
9+ (priv->window->isViewable ()))
10 {
11 int x1, x2, y1, y2;
12
13@@ -339,7 +339,7 @@
14 return;
15
16 if (priv->window->shaded () || force ||
17- (priv->window->isViewable () && priv->damaged))
18+ (priv->window->isViewable ()))
19 {
20 int border = priv->window->geometry ().border ();
21
22@@ -561,7 +561,7 @@
23 CompSize size = CompSize ();
24
25
26- if (window->shaded () || (window->isViewable () && damaged))
27+ if (window->shaded () || (window->isViewable ()))
28 {
29 int x, y, x1, x2, y1, y2;
30
31@@ -618,7 +618,7 @@
32 void
33 PrivateCompositeWindow::moveNotify (int dx, int dy, bool now)
34 {
35- if (window->shaded () || (window->isViewable () && damaged))
36+ if (window->shaded () || (window->isViewable ()))
37 {
38 int x, y, x1, x2, y1, y2;
39
40
41=== modified file 'plugins/opengl/src/paint.cpp'
42--- plugins/opengl/src/paint.cpp 2011-09-16 06:51:02 +0000
43+++ plugins/opengl/src/paint.cpp 2011-09-27 11:57:56 +0000
44@@ -241,8 +241,15 @@
45
46 if (!w->shaded ())
47 {
48- if (!w->isViewable () ||
49- !CompositeWindow::get (w)->damaged ())
50+ /* Non-damaged windows don't have valid pixmap
51+ * contents and we aren't displaying them yet
52+ * so don't factor them into occlusion detection */
53+ if (!gw->priv->cWindow->damaged ())
54+ {
55+ gw->priv->clip = region;
56+ continue;
57+ }
58+ if (!w->isViewable ())
59 continue;
60 }
61
62@@ -322,8 +329,7 @@
63
64 if (!w->shaded ())
65 {
66- if (!w->isViewable () ||
67- !CompositeWindow::get (w)->damaged ())
68+ if (!w->isViewable ())
69 continue;
70 }
71
72@@ -1171,7 +1177,8 @@
73 if (reg.isEmpty ())
74 return true;
75
76- if (!priv->window->isViewable ())
77+ if (!priv->window->isViewable () ||
78+ !priv->cWindow->damaged ())
79 return true;
80
81 if (priv->textures.empty () && !bind ())

Subscribers

People subscribed via source and target branches