commit e1f8498

Michael Forney  ·  2014-08-16 19:49:57 +0000 UTC
parent 22bd1d3
Style
2 files changed,  +11, -13
+2, -4
 1@@ -174,9 +174,9 @@ static struct target * target_new(struct screen * screen)
 2 
 3     return target;
 4 
 5-error1:
 6+  error1:
 7     free(target);
 8-error0:
 9+  error0:
10     return NULL;
11 }
12 
13@@ -216,8 +216,6 @@ static void repaint_view(struct target * target, struct compositor_view * view,
14     /* Draw border */
15     if (pixman_region32_not_empty(&border_damage))
16     {
17-        DEBUG("\t\tRedrawing border\n");
18-
19         pixman_region32_translate(&border_damage,
20                                   -target->view->geometry.x,
21                                   -target->view->geometry.y);
+9, -9
 1@@ -61,18 +61,18 @@ int view_attach(struct view * view, struct wld_buffer * buffer)
 2 {
 3     int ret;
 4 
 5-    if ((ret = view->impl->attach(view, buffer)) == 0)
 6-    {
 7-        if (view->buffer)
 8-            wld_buffer_unreference(view->buffer);
 9+    if ((ret = view->impl->attach(view, buffer)) < 0)
10+        return ret;
11 
12-        if (buffer)
13-            wld_buffer_reference(buffer);
14+    if (view->buffer)
15+        wld_buffer_unreference(view->buffer);
16 
17-        view->buffer = buffer;
18-    }
19+    if (buffer)
20+        wld_buffer_reference(buffer);
21+
22+    view->buffer = buffer;
23 
24-    return ret;
25+    return 0;
26 }
27 
28 bool view_update(struct view * view)