aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/evas
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2017-08-25 10:47:03 -0700
committerCedric BAIL <cedric@osg.samsung.com>2017-08-25 10:47:03 -0700
commit268d9984b4708bb18f9d84bd221a674f09d16048 (patch)
tree05d9c729165f27a2d5c049f51999379d0565de4a /src/lib/evas
parentscroller: fix getting content position. (diff)
downloadefl-268d9984b4708bb18f9d84bd221a674f09d16048.tar.gz
evas: engine should not access Evas canvas directly.
Diffstat (limited to '')
-rw-r--r--src/lib/evas/canvas/evas_main.c2
-rw-r--r--src/lib/evas/canvas/evas_out.c4
-rw-r--r--src/lib/evas/include/evas_private.h4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index 114e12fdd5..a30a853f37 100644
--- a/src/lib/evas/canvas/evas_main.c
+++ b/src/lib/evas/canvas/evas_main.c
@@ -1044,7 +1044,7 @@ evas_output_method_set(Evas *eo_e, int render_method)
Eina_List *l;
EINA_LIST_FOREACH(e->outputs, l, output)
- output->info = e->engine.func->info(eo_e);
+ if (!output->info) output->info = e->engine.func->info();
}
// Wayland/drm already handles seats.
diff --git a/src/lib/evas/canvas/evas_out.c b/src/lib/evas/canvas/evas_out.c
index d66fb0f396..5310d28f5c 100644
--- a/src/lib/evas/canvas/evas_out.c
+++ b/src/lib/evas/canvas/evas_out.c
@@ -40,7 +40,7 @@ efl_canvas_output_add(Evas *canvas)
// right away to setup the info structure
if (e->engine.func->info)
{
- r->info = e->engine.func->info(canvas);
+ r->info = e->engine.func->info();
}
return r;
@@ -62,7 +62,7 @@ efl_canvas_output_del(Efl_Canvas_Output *output)
output->ector);
e->engine.func->output_free(_evas_engine_context(e),
output->output);
- e->engine.func->info_free(output->canvas, output->info);
+ e->engine.func->info_free(output->info);
}
e->outputs = eina_list_remove(e->outputs, output);
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index af5a08318f..294dfb57b1 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -1393,8 +1393,8 @@ struct _Evas_Object_Func
struct _Evas_Func
{
- void *(*info) (Evas *e);
- void (*info_free) (Evas *e, void *info);
+ void *(*info) (void);
+ void (*info_free) (void *info);
void *(*setup) (void *engine, void *info, unsigned int w, unsigned int h);
int (*update) (void *engine, void *data, void *info, unsigned int w, unsigned int h);