From: Seunghun Lee Date: Mon, 3 Feb 2025 08:34:03 +0000 (+0900) Subject: e_canvas: Drop e_canvas_ecore_evas_set X-Git-Tag: accepted/tizen/unified/20250206.153713~18 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a3a5dd776684b78347448136bdad8a34dc756daa;p=platform%2Fupstream%2Fenlightenment.git e_canvas: Drop e_canvas_ecore_evas_set It's superfluous since an Ecore_Evas instance can be acquired by calling ecore_evas_ecore_evas_get() with an Evas instance. Change-Id: Ia76fbec98c71b241b3e3c58748a52c324bfc716e --- diff --git a/src/bin/compmgr/e_comp_canvas.c b/src/bin/compmgr/e_comp_canvas.c index fe6557bf8a..3721c422be 100644 --- a/src/bin/compmgr/e_comp_canvas.c +++ b/src/bin/compmgr/e_comp_canvas.c @@ -307,9 +307,6 @@ e_comp_canvas_init(E_Comp_Screen *comp_screen) comp->w = w; comp->h = h; - // assign ee to the canvas - e_canvas_ecore_evas_set(comp->canvas, ee); - if (!e_hwc_windows_canvas_set(primary_output->hwc, comp->canvas)) { ERR("fail to e_hwc_windows_canvas_set"); diff --git a/src/bin/core/e_canvas.c b/src/bin/core/e_canvas.c index eb4f1b116e..dcc8bb2ccb 100644 --- a/src/bin/core/e_canvas.c +++ b/src/bin/core/e_canvas.c @@ -60,25 +60,19 @@ e_canvas_destroy(E_Canvas *canvas) free(canvas); } -EINTERN void -e_canvas_ecore_evas_set(E_Canvas *canvas, Ecore_Evas *ee) -{ - canvas->ee = ee; -} - EINTERN void e_canvas_damage_add(E_Canvas *canvas) { int w, h; - ecore_evas_geometry_get(canvas->ee, 0, 0, &w, &h); + ecore_evas_geometry_get(ecore_evas_ecore_evas_get(canvas->evas), 0, 0, &w, &h); evas_damage_rectangle_add(canvas->evas, 0, 0, w, h); } EINTERN void e_canvas_render(E_Canvas *canvas) { - ecore_evas_manual_render(canvas->ee); + ecore_evas_manual_render(ecore_evas_ecore_evas_get(canvas->evas)); } EINTERN void diff --git a/src/bin/core/e_canvas_intern.h b/src/bin/core/e_canvas_intern.h index e9c18e778e..dd32fa041a 100644 --- a/src/bin/core/e_canvas_intern.h +++ b/src/bin/core/e_canvas_intern.h @@ -22,7 +22,6 @@ struct _E_Canvas E_View_Tree tree; E_Canvas_Layer_Tree layers[E_CANVAS_LAYER_MAX + 1]; - Ecore_Evas *ee; Evas *evas; struct @@ -45,11 +44,6 @@ E_Canvas *e_canvas_create(Evas *evas); */ void e_canvas_destroy(E_Canvas *canvas); -/** - * Set Ecore_Evas - */ -void e_canvas_ecore_evas_set(E_Canvas *canvas, Ecore_Evas *ee); - /** * Get Evas */