commit bcd3c47

Michael Forney  ·  2014-02-08 08:21:17 +0000 UTC
parent d95b817
compositor: Use assert to ensure view is created by compositor
1 files changed,  +7, -6
+7, -6
 1@@ -546,8 +546,7 @@ bool swc_compositor_remove_surface(struct swc_surface * surface)
 2 {
 3     struct view * view = (void *) surface->view;
 4 
 5-    if (view->base.impl != &view_impl)
 6-        return false;
 7+    assert(view->base.impl == &view_impl);
 8 
 9     swc_compositor_surface_hide(view->surface);
10     swc_surface_set_view(view->surface, NULL);
11@@ -562,8 +561,7 @@ void swc_compositor_surface_show(struct swc_surface * surface)
12 {
13     struct view * view = (void *) surface->view;
14 
15-    if (view->base.impl != &view_impl)
16-        return;
17+    assert(view->base.impl == &view_impl);
18 
19     if (view->visible)
20         return;
21@@ -586,8 +584,7 @@ void swc_compositor_surface_hide(struct swc_surface * surface)
22 {
23     struct view * view = (void *) surface->view;
24 
25-    if (view->base.impl != &view_impl)
26-        return;
27+    assert(view->base.impl == &view_impl);
28 
29     if (!view->visible)
30         return;
31@@ -606,6 +603,8 @@ void swc_compositor_surface_set_border_width(struct swc_surface * surface,
32 {
33     struct view * view = (void *) surface->view;
34 
35+    assert(view->base.impl == &view_impl);
36+
37     if (view->border.width == width)
38         return;
39 
40@@ -623,6 +622,8 @@ void swc_compositor_surface_set_border_color(struct swc_surface * surface,
41 {
42     struct view * view = (void *) surface->view;
43 
44+    assert(view->base.impl == &view_impl);
45+
46     if (view->border.color == color)
47         return;
48