summaryrefslogtreecommitdiff
path: root/src/lib/evas/canvas
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-05-11 13:13:27 +0100
committerTom Hacohen <tom@stosb.com>2016-05-11 13:13:27 +0100
commitd64f2fdd4373dfc477f4d69e6d2ef59ad333763b (patch)
tree99e7c6f486dd2c1273ad90787244d70ed47b5327 /src/lib/evas/canvas
parent70b5f3875e54446e21dcef56e80fc7046a2dbdec (diff)
Efl vg: Remove the no longer needed .Base hack.
Diffstat (limited to 'src/lib/evas/canvas')
-rw-r--r--src/lib/evas/canvas/efl_vg.eo (renamed from src/lib/evas/canvas/efl_vg_base.eo)10
-rw-r--r--src/lib/evas/canvas/efl_vg_container.eo12
-rw-r--r--src/lib/evas/canvas/efl_vg_gradient.eo6
-rw-r--r--src/lib/evas/canvas/efl_vg_gradient_linear.eo6
-rw-r--r--src/lib/evas/canvas/efl_vg_gradient_radial.eo6
-rw-r--r--src/lib/evas/canvas/efl_vg_shape.eo14
-rw-r--r--src/lib/evas/canvas/evas_object_vg.c8
-rw-r--r--src/lib/evas/canvas/evas_vg.eo2
-rw-r--r--src/lib/evas/canvas/evas_vg_container.c20
-rw-r--r--src/lib/evas/canvas/evas_vg_gradient.c12
-rw-r--r--src/lib/evas/canvas/evas_vg_gradient_linear.c24
-rw-r--r--src/lib/evas/canvas/evas_vg_gradient_radial.c26
-rw-r--r--src/lib/evas/canvas/evas_vg_node.c186
-rw-r--r--src/lib/evas/canvas/evas_vg_private.h14
-rw-r--r--src/lib/evas/canvas/evas_vg_root_node.c12
-rw-r--r--src/lib/evas/canvas/evas_vg_shape.c22
16 files changed, 190 insertions, 190 deletions
diff --git a/src/lib/evas/canvas/efl_vg_base.eo b/src/lib/evas/canvas/efl_vg.eo
index 85c0e2b..48d0e66 100644
--- a/src/lib/evas/canvas/efl_vg_base.eo
+++ b/src/lib/evas/canvas/efl_vg.eo
@@ -1,6 +1,6 @@
1import eina_types; 1import eina_types;
2 2
3abstract Efl.VG.Base (Eo.Base, Efl.Gfx, Efl.Gfx.Stack) 3abstract Efl.VG (Eo.Base, Efl.Gfx, Efl.Gfx.Stack)
4{ 4{
5 eo_prefix: efl_vg; 5 eo_prefix: efl_vg;
6 legacy_prefix: evas_vg_node; 6 legacy_prefix: evas_vg_node;
@@ -68,7 +68,7 @@ abstract Efl.VG.Base (Eo.Base, Efl.Gfx, Efl.Gfx.Stack)
68 get { 68 get {
69 } 69 }
70 values { 70 values {
71 m: Efl.VG.Base *; 71 m: Efl.VG *;
72 } 72 }
73 } 73 }
74/* quality { 74/* quality {
@@ -94,14 +94,14 @@ abstract Efl.VG.Base (Eo.Base, Efl.Gfx, Efl.Gfx.Stack)
94 interpolate { 94 interpolate {
95 return: bool; 95 return: bool;
96 params { 96 params {
97 @in from: const(Efl.VG.Base)*; 97 @in from: const(Efl.VG)*;
98 @in to: const(Efl.VG.Base)*; 98 @in to: const(Efl.VG)*;
99 @in pos_map: double; 99 @in pos_map: double;
100 } 100 }
101 } 101 }
102 dup { 102 dup {
103 params { 103 params {
104 @in from: const(Efl.VG.Base)*; 104 @in from: const(Efl.VG)*;
105 } 105 }
106 } 106 }
107 } 107 }
diff --git a/src/lib/evas/canvas/efl_vg_container.eo b/src/lib/evas/canvas/efl_vg_container.eo
index 21bb5e7..3723ebd 100644
--- a/src/lib/evas/canvas/efl_vg_container.eo
+++ b/src/lib/evas/canvas/efl_vg_container.eo
@@ -1,4 +1,4 @@
1class Efl.VG.Container (Efl.VG.Base) 1class Efl.VG.Container (Efl.VG)
2{ 2{
3 legacy_prefix: evas_vg_container; 3 legacy_prefix: evas_vg_container;
4 methods { 4 methods {
@@ -6,17 +6,17 @@ class Efl.VG.Container (Efl.VG.Base)
6 params { 6 params {
7 @in name: const(char)*; 7 @in name: const(char)*;
8 } 8 }
9 return: Efl.VG.Base *; 9 return: Efl.VG *;
10 } 10 }
11 children_get { 11 children_get {
12 return: free(own(iterator<Efl.VG.Base *>*), eina_iterator_free) @warn_unused; 12 return: free(own(iterator<Efl.VG *>*), eina_iterator_free) @warn_unused;
13 } 13 }
14 } 14 }
15 implements { 15 implements {
16 Eo.Base.constructor; 16 Eo.Base.constructor;
17 Eo.Base.destructor; 17 Eo.Base.destructor;
18 Efl.VG.Base.bounds_get; 18 Efl.VG.bounds_get;
19 Efl.VG.Base.interpolate; 19 Efl.VG.interpolate;
20 Efl.VG.Base.dup; 20 Efl.VG.dup;
21 } 21 }
22} 22}
diff --git a/src/lib/evas/canvas/efl_vg_gradient.eo b/src/lib/evas/canvas/efl_vg_gradient.eo
index 6b717fa..01a210a 100644
--- a/src/lib/evas/canvas/efl_vg_gradient.eo
+++ b/src/lib/evas/canvas/efl_vg_gradient.eo
@@ -1,4 +1,4 @@
1abstract Efl.VG.Gradient (Efl.VG.Base, Efl.Gfx.Gradient) 1abstract Efl.VG.Gradient (Efl.VG, Efl.Gfx.Gradient)
2{ 2{
3 legacy_prefix: evas_vg_gradient; 3 legacy_prefix: evas_vg_gradient;
4 implements { 4 implements {
@@ -6,7 +6,7 @@ abstract Efl.VG.Gradient (Efl.VG.Base, Efl.Gfx.Gradient)
6 Efl.Gfx.Gradient.stop.get; 6 Efl.Gfx.Gradient.stop.get;
7 Efl.Gfx.Gradient.spread.set; 7 Efl.Gfx.Gradient.spread.set;
8 Efl.Gfx.Gradient.spread.get; 8 Efl.Gfx.Gradient.spread.get;
9 Efl.VG.Base.interpolate; 9 Efl.VG.interpolate;
10 Efl.VG.Base.dup; 10 Efl.VG.dup;
11 } 11 }
12} 12}
diff --git a/src/lib/evas/canvas/efl_vg_gradient_linear.eo b/src/lib/evas/canvas/efl_vg_gradient_linear.eo
index 381ddb6..3376267 100644
--- a/src/lib/evas/canvas/efl_vg_gradient_linear.eo
+++ b/src/lib/evas/canvas/efl_vg_gradient_linear.eo
@@ -6,9 +6,9 @@ class Efl.VG.Gradient_Linear (Efl.VG.Gradient, Efl.Gfx.Gradient.Linear)
6 Efl.Gfx.Gradient.Linear.start.get; 6 Efl.Gfx.Gradient.Linear.start.get;
7 Efl.Gfx.Gradient.Linear.end.set; 7 Efl.Gfx.Gradient.Linear.end.set;
8 Efl.Gfx.Gradient.Linear.end.get; 8 Efl.Gfx.Gradient.Linear.end.get;
9 Efl.VG.Base.bounds_get; 9 Efl.VG.bounds_get;
10 Efl.VG.Base.interpolate; 10 Efl.VG.interpolate;
11 Efl.VG.Base.dup; 11 Efl.VG.dup;
12 Eo.Base.constructor; 12 Eo.Base.constructor;
13 Eo.Base.destructor; 13 Eo.Base.destructor;
14 } 14 }
diff --git a/src/lib/evas/canvas/efl_vg_gradient_radial.eo b/src/lib/evas/canvas/efl_vg_gradient_radial.eo
index 860c4f7..b41a4b0 100644
--- a/src/lib/evas/canvas/efl_vg_gradient_radial.eo
+++ b/src/lib/evas/canvas/efl_vg_gradient_radial.eo
@@ -8,9 +8,9 @@ class Efl.VG.Gradient_Radial (Efl.VG.Gradient, Efl.Gfx.Gradient.Radial)
8 Efl.Gfx.Gradient.Radial.radius.get; 8 Efl.Gfx.Gradient.Radial.radius.get;
9 Efl.Gfx.Gradient.Radial.focal.set; 9 Efl.Gfx.Gradient.Radial.focal.set;
10 Efl.Gfx.Gradient.Radial.focal.get; 10 Efl.Gfx.Gradient.Radial.focal.get;
11 Efl.VG.Base.bounds_get; 11 Efl.VG.bounds_get;
12 Efl.VG.Base.interpolate; 12 Efl.VG.interpolate;
13 Efl.VG.Base.dup; 13 Efl.VG.dup;
14 Eo.Base.constructor; 14 Eo.Base.constructor;
15 Eo.Base.destructor; 15 Eo.Base.destructor;
16 } 16 }
diff --git a/src/lib/evas/canvas/efl_vg_shape.eo b/src/lib/evas/canvas/efl_vg_shape.eo
index bee31b0..ed74089 100644
--- a/src/lib/evas/canvas/efl_vg_shape.eo
+++ b/src/lib/evas/canvas/efl_vg_shape.eo
@@ -1,4 +1,4 @@
1class Efl.VG.Shape (Efl.VG.Base, Efl.Gfx.Shape) 1class Efl.VG.Shape (Efl.VG, Efl.Gfx.Shape)
2{ 2{
3 legacy_prefix: evas_vg_shape; 3 legacy_prefix: evas_vg_shape;
4 methods { 4 methods {
@@ -8,7 +8,7 @@ class Efl.VG.Shape (Efl.VG.Base, Efl.Gfx.Shape)
8 get { 8 get {
9 } 9 }
10 values { 10 values {
11 f: Efl.VG.Base *; 11 f: Efl.VG *;
12 } 12 }
13 } 13 }
14 @property stroke_fill { 14 @property stroke_fill {
@@ -17,7 +17,7 @@ class Efl.VG.Shape (Efl.VG.Base, Efl.Gfx.Shape)
17 get { 17 get {
18 } 18 }
19 values { 19 values {
20 f: Efl.VG.Base *; 20 f: Efl.VG *;
21 } 21 }
22 } 22 }
23 @property stroke_marker { 23 @property stroke_marker {
@@ -26,16 +26,16 @@ class Efl.VG.Shape (Efl.VG.Base, Efl.Gfx.Shape)
26 get { 26 get {
27 } 27 }
28 values { 28 values {
29 m: Efl.VG.Base *; 29 m: Efl.VG *;
30 } 30 }
31 } 31 }
32 } 32 }
33 implements { 33 implements {
34 Efl.Gfx.color_part.set; 34 Efl.Gfx.color_part.set;
35 Efl.Gfx.color_part.get; 35 Efl.Gfx.color_part.get;
36 Efl.VG.Base.bounds_get; 36 Efl.VG.bounds_get;
37 Efl.VG.Base.interpolate; 37 Efl.VG.interpolate;
38 Efl.VG.Base.dup; 38 Efl.VG.dup;
39 Eo.Base.constructor; 39 Eo.Base.constructor;
40 Eo.Base.destructor; 40 Eo.Base.destructor;
41 } 41 }
diff --git a/src/lib/evas/canvas/evas_object_vg.c b/src/lib/evas/canvas/evas_object_vg.c
index 0446511..74c72fd 100644
--- a/src/lib/evas/canvas/evas_object_vg.c
+++ b/src/lib/evas/canvas/evas_object_vg.c
@@ -163,9 +163,9 @@ _evas_vg_render(Evas_Object_Protected_Data *obj, Evas_VG_Data *vd,
163 } 163 }
164 else 164 else
165 { 165 {
166 Efl_VG_Base_Data *nd; 166 Efl_VG_Data *nd;
167 167
168 nd = eo_data_scope_get(n, EFL_VG_BASE_CLASS); 168 nd = eo_data_scope_get(n, EFL_VG_CLASS);
169 169
170 obj->layer->evas->engine.func->ector_renderer_draw(output, context, surface, vd->engine_data, nd->renderer, clips, do_async); 170 obj->layer->evas->engine.func->ector_renderer_draw(output, context, surface, vd->engine_data, nd->renderer, clips, do_async);
171 171
@@ -228,7 +228,7 @@ evas_object_vg_render_pre(Evas_Object *eo_obj,
228 void *type_private_data) 228 void *type_private_data)
229{ 229{
230 Evas_VG_Data *vd = type_private_data; 230 Evas_VG_Data *vd = type_private_data;
231 Efl_VG_Base_Data *rnd; 231 Efl_VG_Data *rnd;
232 int is_v, was_v; 232 int is_v, was_v;
233 Ector_Surface *s; 233 Ector_Surface *s;
234 234
@@ -264,7 +264,7 @@ evas_object_vg_render_pre(Evas_Object *eo_obj,
264 264
265 // FIXME: for now the walking Evas_VG_Node tree doesn't trigger any damage 265 // FIXME: for now the walking Evas_VG_Node tree doesn't trigger any damage
266 // So just forcing it here if necessary 266 // So just forcing it here if necessary
267 rnd = eo_data_scope_get(vd->root, EFL_VG_BASE_CLASS); 267 rnd = eo_data_scope_get(vd->root, EFL_VG_CLASS);
268 268
269 // Once the destructor has been called, root node will be zero 269 // Once the destructor has been called, root node will be zero
270 // and a full redraw is still necessary. 270 // and a full redraw is still necessary.
diff --git a/src/lib/evas/canvas/evas_vg.eo b/src/lib/evas/canvas/evas_vg.eo
index 53aa19f..96caa45 100644
--- a/src/lib/evas/canvas/evas_vg.eo
+++ b/src/lib/evas/canvas/evas_vg.eo
@@ -14,7 +14,7 @@ class Evas.VG (Evas.Object, Efl.Gfx.Fill, Efl.Gfx.View)
14 @since 1.14]] 14 @since 1.14]]
15 } 15 }
16 values { 16 values {
17 container: Eo.Base *; [[Root node of the VG canvas.]] /* FIXME: Should be Efl.VG.Base */ 17 container: Eo.Base *; [[Root node of the VG canvas.]] /* FIXME: Should be Efl.VG */
18 } 18 }
19 } 19 }
20 } 20 }
diff --git a/src/lib/evas/canvas/evas_vg_container.c b/src/lib/evas/canvas/evas_vg_container.c
index c7ca580..a805902 100644
--- a/src/lib/evas/canvas/evas_vg_container.c
+++ b/src/lib/evas/canvas/evas_vg_container.c
@@ -10,7 +10,7 @@ _efl_vg_container_render_pre(Eo *obj EINA_UNUSED,
10 Eina_Matrix3 *parent, 10 Eina_Matrix3 *parent,
11 Ector_Surface *s, 11 Ector_Surface *s,
12 void *data, 12 void *data,
13 Efl_VG_Base_Data *nd) 13 Efl_VG_Data *nd)
14{ 14{
15 Efl_VG_Container_Data *pd = data; 15 Efl_VG_Container_Data *pd = data;
16 Eina_List *l; 16 Eina_List *l;
@@ -29,13 +29,13 @@ static Eo *
29_efl_vg_container_eo_base_constructor(Eo *obj, 29_efl_vg_container_eo_base_constructor(Eo *obj,
30 Efl_VG_Container_Data *pd) 30 Efl_VG_Container_Data *pd)
31{ 31{
32 Efl_VG_Base_Data *nd; 32 Efl_VG_Data *nd;
33 33
34 pd->names = eina_hash_stringshared_new(NULL); 34 pd->names = eina_hash_stringshared_new(NULL);
35 35
36 obj = eo_constructor(eo_super(obj, MY_CLASS)); 36 obj = eo_constructor(eo_super(obj, MY_CLASS));
37 37
38 nd = eo_data_scope_get(obj, EFL_VG_BASE_CLASS); 38 nd = eo_data_scope_get(obj, EFL_VG_CLASS);
39 nd->render_pre = _efl_vg_container_render_pre; 39 nd->render_pre = _efl_vg_container_render_pre;
40 nd->data = pd; 40 nd->data = pd;
41 41
@@ -53,7 +53,7 @@ _efl_vg_container_eo_base_destructor(Eo *obj,
53} 53}
54 54
55static void 55static void
56_efl_vg_container_efl_vg_base_bounds_get(Eo *obj EINA_UNUSED, 56_efl_vg_container_efl_vg_bounds_get(Eo *obj EINA_UNUSED,
57 Efl_VG_Container_Data *pd, 57 Efl_VG_Container_Data *pd,
58 Eina_Rectangle *r) 58 Eina_Rectangle *r)
59{ 59{
@@ -79,11 +79,11 @@ _efl_vg_container_efl_vg_base_bounds_get(Eo *obj EINA_UNUSED,
79 } 79 }
80} 80}
81 81
82static Efl_VG_Base * 82static Efl_VG *
83_efl_vg_container_child_get(Eo *obj EINA_UNUSED, Efl_VG_Container_Data *pd, const char *name) 83_efl_vg_container_child_get(Eo *obj EINA_UNUSED, Efl_VG_Container_Data *pd, const char *name)
84{ 84{
85 const char *tmp = eina_stringshare_add(name); 85 const char *tmp = eina_stringshare_add(name);
86 Efl_VG_Base *r; 86 Efl_VG *r;
87 87
88 r = eina_hash_find(pd->names, tmp); 88 r = eina_hash_find(pd->names, tmp);
89 eina_stringshare_del(tmp); 89 eina_stringshare_del(tmp);
@@ -98,9 +98,9 @@ _efl_vg_container_children_get(Eo *obj EINA_UNUSED, Efl_VG_Container_Data *pd)
98} 98}
99 99
100static Eina_Bool 100static Eina_Bool
101_efl_vg_container_efl_vg_base_interpolate(Eo *obj, 101_efl_vg_container_efl_vg_interpolate(Eo *obj,
102 Efl_VG_Container_Data *pd, 102 Efl_VG_Container_Data *pd,
103 const Efl_VG_Base *from, const Efl_VG_Base *to, 103 const Efl_VG *from, const Efl_VG *to,
104 double pos_map) 104 double pos_map)
105{ 105{
106 Efl_VG_Container_Data *fd; 106 Efl_VG_Container_Data *fd;
@@ -136,9 +136,9 @@ _efl_vg_container_efl_vg_base_interpolate(Eo *obj,
136} 136}
137 137
138static void 138static void
139_efl_vg_container_efl_vg_base_dup(Eo *obj, 139_efl_vg_container_efl_vg_dup(Eo *obj,
140 Efl_VG_Container_Data *pd, 140 Efl_VG_Container_Data *pd,
141 const Efl_VG_Base *from) 141 const Efl_VG *from)
142{ 142{
143 Efl_VG_Container_Data *fromd; 143 Efl_VG_Container_Data *fromd;
144 Eina_List *l; 144 Eina_List *l;
diff --git a/src/lib/evas/canvas/evas_vg_gradient.c b/src/lib/evas/canvas/evas_vg_gradient.c
index db7eedb..492bafb 100644
--- a/src/lib/evas/canvas/evas_vg_gradient.c
+++ b/src/lib/evas/canvas/evas_vg_gradient.c
@@ -21,7 +21,7 @@ _efl_vg_gradient_efl_gfx_gradient_stop_set(Eo *obj EINA_UNUSED,
21 memcpy(pd->colors, colors, length * sizeof(Efl_Gfx_Gradient_Stop)); 21 memcpy(pd->colors, colors, length * sizeof(Efl_Gfx_Gradient_Stop));
22 pd->colors_count = length; 22 pd->colors_count = length;
23 23
24 _efl_vg_base_changed(obj); 24 _efl_vg_changed(obj);
25} 25}
26 26
27static void 27static void
@@ -41,7 +41,7 @@ _efl_vg_gradient_efl_gfx_gradient_spread_set(Eo *obj EINA_UNUSED,
41{ 41{
42 pd->s = s; 42 pd->s = s;
43 43
44 _efl_vg_base_changed(obj); 44 _efl_vg_changed(obj);
45} 45}
46 46
47static Efl_Gfx_Gradient_Spread 47static Efl_Gfx_Gradient_Spread
@@ -52,9 +52,9 @@ _efl_vg_gradient_efl_gfx_gradient_spread_get(Eo *obj EINA_UNUSED,
52} 52}
53 53
54static Eina_Bool 54static Eina_Bool
55_efl_vg_gradient_efl_vg_base_interpolate(Eo *obj, 55_efl_vg_gradient_efl_vg_interpolate(Eo *obj,
56 Efl_VG_Gradient_Data *pd, 56 Efl_VG_Gradient_Data *pd,
57 const Efl_VG_Base *from, const Efl_VG_Base *to, 57 const Efl_VG *from, const Efl_VG *to,
58 double pos_map) 58 double pos_map)
59{ 59{
60 Efl_VG_Gradient_Data *fromd, *tod; 60 Efl_VG_Gradient_Data *fromd, *tod;
@@ -95,9 +95,9 @@ _efl_vg_gradient_efl_vg_base_interpolate(Eo *obj,
95} 95}
96 96
97static void 97static void
98_efl_vg_gradient_efl_vg_base_dup(Eo *obj, 98_efl_vg_gradient_efl_vg_dup(Eo *obj,
99 Efl_VG_Gradient_Data *pd EINA_UNUSED, 99 Efl_VG_Gradient_Data *pd EINA_UNUSED,
100 const Efl_VG_Base *from) 100 const Efl_VG *from)
101{ 101{
102 Efl_VG_Gradient_Data *fromd; 102 Efl_VG_Gradient_Data *fromd;
103 103
diff --git a/src/lib/evas/canvas/evas_vg_gradient_linear.c b/src/lib/evas/canvas/evas_vg_gradient_linear.c
index 6fd12b2..5aa2607 100644
--- a/src/lib/evas/canvas/evas_vg_gradient_linear.c
+++ b/src/lib/evas/canvas/evas_vg_gradient_linear.c
@@ -23,7 +23,7 @@ _efl_vg_gradient_linear_efl_gfx_gradient_linear_start_set(Eo *obj EINA_UNUSED,
23 pd->start.x = x; 23 pd->start.x = x;
24 pd->start.y = y; 24 pd->start.y = y;
25 25
26 _efl_vg_base_changed(obj); 26 _efl_vg_changed(obj);
27} 27}
28 28
29static void 29static void
@@ -43,7 +43,7 @@ _efl_vg_gradient_linear_efl_gfx_gradient_linear_end_set(Eo *obj EINA_UNUSED,
43 pd->end.x = x; 43 pd->end.x = x;
44 pd->end.y = y; 44 pd->end.y = y;
45 45
46 _efl_vg_base_changed(obj); 46 _efl_vg_changed(obj);
47} 47}
48 48
49static void 49static void
@@ -60,7 +60,7 @@ _efl_vg_gradient_linear_render_pre(Eo *obj,
60 Eina_Matrix3 *parent, 60 Eina_Matrix3 *parent,
61 Ector_Surface *s, 61 Ector_Surface *s,
62 void *data, 62 void *data,
63 Efl_VG_Base_Data *nd) 63 Efl_VG_Data *nd)
64{ 64{
65 Efl_VG_Gradient_Linear_Data *pd = data; 65 Efl_VG_Gradient_Linear_Data *pd = data;
66 Efl_VG_Gradient_Data *gd; 66 Efl_VG_Gradient_Data *gd;
@@ -91,11 +91,11 @@ static Eo *
91_efl_vg_gradient_linear_eo_base_constructor(Eo *obj, 91_efl_vg_gradient_linear_eo_base_constructor(Eo *obj,
92 Efl_VG_Gradient_Linear_Data *pd) 92 Efl_VG_Gradient_Linear_Data *pd)
93{ 93{
94 Efl_VG_Base_Data *nd; 94 Efl_VG_Data *nd;
95 95
96 obj = eo_constructor(eo_super(obj, MY_CLASS)); 96 obj = eo_constructor(eo_super(obj, MY_CLASS));
97 97
98 nd = eo_data_scope_get(obj, EFL_VG_BASE_CLASS); 98 nd = eo_data_scope_get(obj, EFL_VG_CLASS);
99 nd->render_pre = _efl_vg_gradient_linear_render_pre; 99 nd->render_pre = _efl_vg_gradient_linear_render_pre;
100 nd->data = pd; 100 nd->data = pd;
101 101
@@ -109,20 +109,20 @@ _efl_vg_gradient_linear_eo_base_destructor(Eo *obj, Efl_VG_Gradient_Linear_Data
109} 109}
110 110
111static void 111static void
112_efl_vg_gradient_linear_efl_vg_base_bounds_get(Eo *obj, Efl_VG_Gradient_Linear_Data *pd, Eina_Rectangle *r) 112_efl_vg_gradient_linear_efl_vg_bounds_get(Eo *obj, Efl_VG_Gradient_Linear_Data *pd, Eina_Rectangle *r)
113{ 113{
114 Efl_VG_Base_Data *nd; 114 Efl_VG_Data *nd;
115 115
116 nd = eo_data_scope_get(obj, EFL_VG_BASE_CLASS); 116 nd = eo_data_scope_get(obj, EFL_VG_CLASS);
117 EINA_RECTANGLE_SET(r, 117 EINA_RECTANGLE_SET(r,
118 nd->x + pd->start.x, nd->y + pd->start.y, 118 nd->x + pd->start.x, nd->y + pd->start.y,
119 pd->end.x - pd->start.x, pd->end.y - pd->start.x); 119 pd->end.x - pd->start.x, pd->end.y - pd->start.x);
120} 120}
121 121
122static Eina_Bool 122static Eina_Bool
123_efl_vg_gradient_linear_efl_vg_base_interpolate(Eo *obj, 123_efl_vg_gradient_linear_efl_vg_interpolate(Eo *obj,
124 Efl_VG_Gradient_Linear_Data *pd, 124 Efl_VG_Gradient_Linear_Data *pd,
125 const Efl_VG_Base *from, const Efl_VG_Base *to, 125 const Efl_VG *from, const Efl_VG *to,
126 double pos_map) 126 double pos_map)
127{ 127{
128 Efl_VG_Gradient_Linear_Data *fromd, *tod; 128 Efl_VG_Gradient_Linear_Data *fromd, *tod;
@@ -151,9 +151,9 @@ _efl_vg_gradient_linear_efl_vg_base_interpolate(Eo *obj,
151} 151}
152 152
153static void 153static void
154_efl_vg_gradient_linear_efl_vg_base_dup(Eo *obj, 154_efl_vg_gradient_linear_efl_vg_dup(Eo *obj,
155 Efl_VG_Gradient_Linear_Data *pd EINA_UNUSED, 155 Efl_VG_Gradient_Linear_Data *pd EINA_UNUSED,
156 const Efl_VG_Base *from) 156 const Efl_VG *from)
157{ 157{
158 Efl_VG_Gradient_Linear_Data *fromd; 158 Efl_VG_Gradient_Linear_Data *fromd;
159 159
diff --git a/src/lib/evas/canvas/evas_vg_gradient_radial.c b/src/lib/evas/canvas/evas_vg_gradient_radial.c
index 21cd703..c36150a 100644
--- a/src/lib/evas/canvas/evas_vg_gradient_radial.c
+++ b/src/lib/evas/canvas/evas_vg_gradient_radial.c
@@ -22,7 +22,7 @@ _efl_vg_gradient_radial_efl_gfx_gradient_radial_center_set(Eo *obj EINA_UNUSED,
22 pd->center.x = x; 22 pd->center.x = x;
23 pd->center.y = y; 23 pd->center.y = y;
24 24
25 _efl_vg_base_changed(obj); 25 _efl_vg_changed(obj);
26} 26}
27 27
28static void 28static void
@@ -41,7 +41,7 @@ _efl_vg_gradient_radial_efl_gfx_gradient_radial_radius_set(Eo *obj EINA_UNUSED,
41{ 41{
42 pd->radius = r; 42 pd->radius = r;
43 43
44 _efl_vg_base_changed(obj); 44 _efl_vg_changed(obj);
45} 45}
46 46
47static double 47static double
@@ -59,7 +59,7 @@ _efl_vg_gradient_radial_efl_gfx_gradient_radial_focal_set(Eo *obj EINA_UNUSED,
59 pd->focal.x = x; 59 pd->focal.x = x;
60 pd->focal.y = y; 60 pd->focal.y = y;
61 61
62 _efl_vg_base_changed(obj); 62 _efl_vg_changed(obj);
63} 63}
64 64
65static void 65static void
@@ -76,7 +76,7 @@ _efl_vg_gradient_radial_render_pre(Eo *obj,
76 Eina_Matrix3 *parent, 76 Eina_Matrix3 *parent,
77 Ector_Surface *s, 77 Ector_Surface *s,
78 void *data, 78 void *data,
79 Efl_VG_Base_Data *nd) 79 Efl_VG_Data *nd)
80{ 80{
81 Efl_VG_Gradient_Radial_Data *pd = data; 81 Efl_VG_Gradient_Radial_Data *pd = data;
82 Efl_VG_Gradient_Data *gd; 82 Efl_VG_Gradient_Data *gd;
@@ -107,11 +107,11 @@ _efl_vg_gradient_radial_render_pre(Eo *obj,
107static Eo * 107static Eo *
108_efl_vg_gradient_radial_eo_base_constructor(Eo *obj, Efl_VG_Gradient_Radial_Data *pd) 108_efl_vg_gradient_radial_eo_base_constructor(Eo *obj, Efl_VG_Gradient_Radial_Data *pd)
109{ 109{
110 Efl_VG_Base_Data *nd; 110 Efl_VG_Data *nd;
111 111
112 obj = eo_constructor(eo_super(obj, MY_CLASS)); 112 obj = eo_constructor(eo_super(obj, MY_CLASS));
113 113
114 nd = eo_data_scope_get(obj, EFL_VG_BASE_CLASS); 114 nd = eo_data_scope_get(obj, EFL_VG_CLASS);
115 nd->render_pre = _efl_vg_gradient_radial_render_pre; 115 nd->render_pre = _efl_vg_gradient_radial_render_pre;
116 nd->data = pd; 116 nd->data = pd;
117 117
@@ -126,11 +126,11 @@ _efl_vg_gradient_radial_eo_base_destructor(Eo *obj,
126} 126}
127 127
128static void 128static void
129_efl_vg_gradient_radial_efl_vg_base_bounds_get(Eo *obj, Efl_VG_Gradient_Radial_Data *pd, Eina_Rectangle *r) 129_efl_vg_gradient_radial_efl_vg_bounds_get(Eo *obj, Efl_VG_Gradient_Radial_Data *pd, Eina_Rectangle *r)
130{ 130{
131 Efl_VG_Base_Data *nd; 131 Efl_VG_Data *nd;
132 132
133 nd = eo_data_scope_get(obj, EFL_VG_BASE_CLASS); 133 nd = eo_data_scope_get(obj, EFL_VG_CLASS);
134 EINA_RECTANGLE_SET(r, 134 EINA_RECTANGLE_SET(r,
135 nd->x + pd->center.x - pd->radius, 135 nd->x + pd->center.x - pd->radius,
136 nd->y + pd->center.y - pd->radius, 136 nd->y + pd->center.y - pd->radius,
@@ -138,9 +138,9 @@ _efl_vg_gradient_radial_efl_vg_base_bounds_get(Eo *obj, Efl_VG_Gradient_Radial_D
138} 138}
139 139
140static Eina_Bool 140static Eina_Bool
141_efl_vg_gradient_radial_efl_vg_base_interpolate(Eo *obj, 141_efl_vg_gradient_radial_efl_vg_interpolate(Eo *obj,
142 Efl_VG_Gradient_Radial_Data *pd, 142 Efl_VG_Gradient_Radial_Data *pd,
143 const Efl_VG_Base *from, const Efl_VG_Base *to, 143 const Efl_VG *from, const Efl_VG *to,
144 double pos_map) 144 double pos_map)
145{ 145{
146 Efl_VG_Gradient_Radial_Data *fromd, *tod; 146 Efl_VG_Gradient_Radial_Data *fromd, *tod;
@@ -170,9 +170,9 @@ _efl_vg_gradient_radial_efl_vg_base_interpolate(Eo *obj,
170} 170}
171 171
172static void 172static void
173_efl_vg_gradient_radial_efl_vg_base_dup(Eo *obj, 173_efl_vg_gradient_radial_efl_vg_dup(Eo *obj,
174 Efl_VG_Gradient_Radial_Data *pd EINA_UNUSED, 174 Efl_VG_Gradient_Radial_Data *pd EINA_UNUSED,
175 const Efl_VG_Base *from) 175 const Efl_VG *from)
176{ 176{
177 Efl_VG_Gradient_Radial_Data *fromd; 177 Efl_VG_Gradient_Radial_Data *fromd;
178 178
diff --git a/src/lib/evas/canvas/evas_vg_node.c b/src/lib/evas/canvas/evas_vg_node.c
index c120cf7..1a0cdcb 100644
--- a/src/lib/evas/canvas/evas_vg_node.c
+++ b/src/lib/evas/canvas/evas_vg_node.c
@@ -7,7 +7,7 @@
7#include <string.h> 7#include <string.h>
8#include <math.h> 8#include <math.h>
9 9
10#define MY_CLASS EFL_VG_BASE_CLASS 10#define MY_CLASS EFL_VG_CLASS
11 11
12static const Efl_VG_Interpolation interpolation_identity = { 12static const Efl_VG_Interpolation interpolation_identity = {
13 { 0, 0, 0, 1 }, 13 { 0, 0, 0, 1 },
@@ -18,9 +18,9 @@ static const Efl_VG_Interpolation interpolation_identity = {
18}; 18};
19 19
20static Eina_Bool 20static Eina_Bool
21_efl_vg_base_property_changed(void *data, const Eo_Event *event) 21_efl_vg_property_changed(void *data, const Eo_Event *event)
22{ 22{
23 Efl_VG_Base_Data *pd = data; 23 Efl_VG_Data *pd = data;
24 Eo *parent; 24 Eo *parent;
25 25
26 if (pd->changed) return EINA_TRUE; 26 if (pd->changed) return EINA_TRUE;
@@ -32,8 +32,8 @@ _efl_vg_base_property_changed(void *data, const Eo_Event *event)
32} 32}
33 33
34static void 34static void
35_efl_vg_base_transformation_set(Eo *obj, 35_efl_vg_transformation_set(Eo *obj,
36 Efl_VG_Base_Data *pd, 36 Efl_VG_Data *pd,
37 const Eina_Matrix3 *m) 37 const Eina_Matrix3 *m)
38{ 38{
39 if (pd->intp) 39 if (pd->intp)
@@ -57,29 +57,29 @@ _efl_vg_base_transformation_set(Eo *obj,
57 pd->m = NULL; 57 pd->m = NULL;
58 } 58 }
59 59
60 _efl_vg_base_changed(obj); 60 _efl_vg_changed(obj);
61} 61}
62 62
63const Eina_Matrix3 * 63const Eina_Matrix3 *
64_efl_vg_base_transformation_get(Eo *obj EINA_UNUSED, Efl_VG_Base_Data *pd) 64_efl_vg_transformation_get(Eo *obj EINA_UNUSED, Efl_VG_Data *pd)
65{ 65{
66 return pd->m; 66 return pd->m;
67} 67}
68 68
69static void 69static void
70_efl_vg_base_origin_set(Eo *obj, 70_efl_vg_origin_set(Eo *obj,
71 Efl_VG_Base_Data *pd, 71 Efl_VG_Data *pd,
72 double x, double y) 72 double x, double y)
73{ 73{
74 pd->x = x; 74 pd->x = x;
75 pd->y = y; 75 pd->y = y;
76 76
77 _efl_vg_base_changed(obj); 77 _efl_vg_changed(obj);
78} 78}
79 79
80static void 80static void
81_efl_vg_base_origin_get(Eo *obj EINA_UNUSED, 81_efl_vg_origin_get(Eo *obj EINA_UNUSED,
82 Efl_VG_Base_Data *pd, 82 Efl_VG_Data *pd,
83 double *x, double *y) 83 double *x, double *y)
84{ 84{
85 if (x) *x = pd->x; 85 if (x) *x = pd->x;
@@ -87,19 +87,19 @@ _efl_vg_base_origin_get(Eo *obj EINA_UNUSED,
87} 87}
88 88
89static void 89static void
90_efl_vg_base_efl_gfx_position_set(Eo *obj EINA_UNUSED, 90_efl_vg_efl_gfx_position_set(Eo *obj EINA_UNUSED,
91 Efl_VG_Base_Data *pd, 91 Efl_VG_Data *pd,
92 int x, int y) 92 int x, int y)
93{ 93{
94 pd->x = lrint(x); 94 pd->x = lrint(x);
95 pd->y = lrint(y); 95 pd->y = lrint(y);
96 96
97 _efl_vg_base_changed(obj); 97 _efl_vg_changed(obj);
98} 98}
99 99
100static void 100static void
101_efl_vg_base_efl_gfx_position_get(Eo *obj EINA_UNUSED, 101_efl_vg_efl_gfx_position_get(Eo *obj EINA_UNUSED,
102 Efl_VG_Base_Data *pd, 102 Efl_VG_Data *pd,
103 int *x, int *y) 103 int *x, int *y)
104{ 104{
105 if (x) *x = pd->x; 105 if (x) *x = pd->x;
@@ -107,25 +107,25 @@ _efl_vg_base_efl_gfx_position_get(Eo *obj EINA_UNUSED,
107} 107}
108 108
109static void 109static void
110_efl_vg_base_efl_gfx_visible_set(Eo *obj EINA_UNUSED, 110_efl_vg_efl_gfx_visible_set(Eo *obj EINA_UNUSED,
111 Efl_VG_Base_Data *pd, Eina_Bool v) 111 Efl_VG_Data *pd, Eina_Bool v)
112{ 112{
113 pd->visibility = v; 113 pd->visibility = v;
114 114
115 _efl_vg_base_changed(obj); 115 _efl_vg_changed(obj);
116} 116}
117 117
118 118
119static Eina_Bool 119static Eina_Bool
120_efl_vg_base_efl_gfx_visible_get(Eo *obj EINA_UNUSED, 120_efl_vg_efl_gfx_visible_get(Eo *obj EINA_UNUSED,
121 Efl_VG_Base_Data *pd) 121 Efl_VG_Data *pd)
122{ 122{
123 return pd->visibility; 123 return pd->visibility;
124} 124}
125 125
126static void 126static void
127_efl_vg_base_efl_gfx_color_set(Eo *obj EINA_UNUSED, 127_efl_vg_efl_gfx_color_set(Eo *obj EINA_UNUSED,
128 Efl_VG_Base_Data *pd, 128 Efl_VG_Data *pd,
129 int r, int g, int b, int a) 129 int r, int g, int b, int a)
130{ 130{
131 if (r > 255) r = 255; if (r < 0) r = 0; 131 if (r > 255) r = 255; if (r < 0) r = 0;
@@ -153,23 +153,23 @@ _efl_vg_base_efl_gfx_color_set(Eo *obj EINA_UNUSED,
153 pd->b = b; 153 pd->b = b;
154 pd->a = a; 154 pd->a = a;
155 155
156 _efl_vg_base_changed(obj); 156 _efl_vg_changed(obj);
157} 157}
158 158
159static Eina_Bool 159static Eina_Bool
160_efl_vg_base_efl_gfx_color_part_set(Eo *obj, Efl_VG_Base_Data *pd, 160_efl_vg_efl_gfx_color_part_set(Eo *obj, Efl_VG_Data *pd,
161 const char *part, 161 const char *part,
162 int r, int g, int b, int a) 162 int r, int g, int b, int a)
163{ 163{
164 if (part) return EINA_FALSE; 164 if (part) return EINA_FALSE;
165 165
166 _efl_vg_base_efl_gfx_color_set(obj, pd, r, g, b, a); 166 _efl_vg_efl_gfx_color_set(obj, pd, r, g, b, a);
167 return EINA_TRUE; 167 return EINA_TRUE;
168} 168}
169 169
170static void 170static void
171_efl_vg_base_efl_gfx_color_get(Eo *obj EINA_UNUSED, 171_efl_vg_efl_gfx_color_get(Eo *obj EINA_UNUSED,
172 Efl_VG_Base_Data *pd, 172 Efl_VG_Data *pd,
173 int *r, int *g, int *b, int *a) 173 int *r, int *g, int *b, int *a)
174{ 174{
175 if (r) *r = pd->r; 175 if (r) *r = pd->r;
@@ -179,38 +179,38 @@ _efl_vg_base_efl_gfx_color_get(Eo *obj EINA_UNUSED,
179} 179}
180 180
181static Eina_Bool 181static Eina_Bool
182_efl_vg_base_efl_gfx_color_part_get(Eo *obj, Efl_VG_Base_Data *pd, 182_efl_vg_efl_gfx_color_part_get(Eo *obj, Efl_VG_Data *pd,
183 const char *part, 183 const char *part,
184 int *r, int *g, int *b, int *a) 184 int *r, int *g, int *b, int *a)
185{ 185{
186 if (part) return EINA_FALSE; 186 if (part) return EINA_FALSE;
187 187
188 _efl_vg_base_efl_gfx_color_get(obj, pd, r, g, b, a); 188 _efl_vg_efl_gfx_color_get(obj, pd, r, g, b, a);
189 return EINA_TRUE; 189 return EINA_TRUE;
190} 190}
191 191
192static void 192static void
193_efl_vg_base_mask_set(Eo *obj EINA_UNUSED, 193_efl_vg_mask_set(Eo *obj EINA_UNUSED,
194 Efl_VG_Base_Data *pd, 194 Efl_VG_Data *pd,
195 Efl_VG_Base *r) 195 Efl_VG *r)
196{ 196{
197 Efl_VG_Base *tmp = pd->mask; 197 Efl_VG *tmp = pd->mask;
198 198
199 pd->mask = eo_ref(r); 199 pd->mask = eo_ref(r);
200 eo_unref(tmp); 200 eo_unref(tmp);
201 201
202 _efl_vg_base_changed(obj); 202 _efl_vg_changed(obj);
203} 203}
204 204
205static Efl_VG_Base* 205static Efl_VG*
206_efl_vg_base_mask_get(Eo *obj EINA_UNUSED, Efl_VG_Base_Data *pd) 206_efl_vg_mask_get(Eo *obj EINA_UNUSED, Efl_VG_Data *pd)
207{ 207{
208 return pd->mask; 208 return pd->mask;
209} 209}
210 210
211static void 211static void
212_efl_vg_base_efl_gfx_size_get(Eo *obj, 212_efl_vg_efl_gfx_size_get(Eo *obj,
213 Efl_VG_Base_Data *pd EINA_UNUSED, 213 Efl_VG_Data *pd EINA_UNUSED,
214 int *w, int *h) 214 int *w, int *h)
215{ 215{
216 Eina_Rectangle r = { 0, 0, 0, 0 }; 216 Eina_Rectangle r = { 0, 0, 0, 0 };
@@ -222,7 +222,7 @@ _efl_vg_base_efl_gfx_size_get(Eo *obj,
222 222
223// Parent should be a container otherwise dismissing the stacking operation 223// Parent should be a container otherwise dismissing the stacking operation
224static Eina_Bool 224static Eina_Bool
225_efl_vg_base_parent_checked_get(Eo *obj, 225_efl_vg_parent_checked_get(Eo *obj,
226 Eo **parent, 226 Eo **parent,
227 Efl_VG_Container_Data **cd) 227 Efl_VG_Container_Data **cd)
228{ 228{
@@ -257,27 +257,27 @@ _efl_vg_base_parent_checked_get(Eo *obj,
257} 257}
258 258
259static Eo * 259static Eo *
260_efl_vg_base_eo_base_constructor(Eo *obj, 260_efl_vg_eo_base_constructor(Eo *obj,
261 Efl_VG_Base_Data *pd) 261 Efl_VG_Data *pd)
262{ 262{
263 Efl_VG_Container_Data *cd = NULL; 263 Efl_VG_Container_Data *cd = NULL;
264 Eo *parent; 264 Eo *parent;
265 265
266 obj = eo_constructor(eo_super(obj, MY_CLASS)); 266 obj = eo_constructor(eo_super(obj, MY_CLASS));
267 267
268 if (!_efl_vg_base_parent_checked_get(obj, &parent, &cd)) { 268 if (!_efl_vg_parent_checked_get(obj, &parent, &cd)) {
269 ERR("Failed"); 269 ERR("Failed");
270 return NULL; 270 return NULL;
271 } 271 }
272 272
273 eo_event_callback_add(obj, EFL_GFX_CHANGED, _efl_vg_base_property_changed, pd); 273 eo_event_callback_add(obj, EFL_GFX_CHANGED, _efl_vg_property_changed, pd);
274 pd->changed = EINA_TRUE; 274 pd->changed = EINA_TRUE;
275 275
276 return obj; 276 return obj;
277} 277}
278 278
279static void 279static void
280_efl_vg_base_eo_base_destructor(Eo *obj, Efl_VG_Base_Data *pd) 280_efl_vg_eo_base_destructor(Eo *obj, Efl_VG_Data *pd)
281{ 281{
282 if (pd->m) 282 if (pd->m)
283 { 283 {
@@ -300,7 +300,7 @@ _efl_vg_base_eo_base_destructor(Eo *obj, Efl_VG_Base_Data *pd)
300} 300}
301 301
302static void 302static void
303_efl_vg_base_name_insert(Eo *obj, Efl_VG_Base_Data *pd, Efl_VG_Container_Data *cd) 303_efl_vg_name_insert(Eo *obj, Efl_VG_Data *pd, Efl_VG_Container_Data *cd)
304{ 304{
305 Eo *set; 305 Eo *set;
306 306
@@ -321,30 +321,30 @@ _efl_vg_base_name_insert(Eo *obj, Efl_VG_Base_Data *pd, Efl_VG_Container_Data *c
321} 321}
322 322
323static void 323static void
324_efl_vg_base_name_set(Eo *obj, Efl_VG_Base_Data *pd, const char *name) 324_efl_vg_name_set(Eo *obj, Efl_VG_Data *pd, const char *name)
325{ 325{
326 Efl_VG_Container_Data *cd = NULL; 326 Efl_VG_Container_Data *cd = NULL;
327 Eo *parent = NULL; 327 Eo *parent = NULL;
328 328
329 if (_efl_vg_base_parent_checked_get(obj, &parent, &cd)) 329 if (_efl_vg_parent_checked_get(obj, &parent, &cd))
330 { 330 {
331 if (pd->name) eina_hash_del(cd->names, pd->name, obj); 331 if (pd->name) eina_hash_del(cd->names, pd->name, obj);
332 } 332 }
333 333
334 eina_stringshare_replace(&pd->name, name); 334 eina_stringshare_replace(&pd->name, name);
335 335
336 if (cd) _efl_vg_base_name_insert(obj, pd, cd); 336 if (cd) _efl_vg_name_insert(obj, pd, cd);
337} 337}
338 338
339static const char * 339static const char *
340_efl_vg_base_name_get(Eo *obj EINA_UNUSED, Efl_VG_Base_Data *pd) 340_efl_vg_name_get(Eo *obj EINA_UNUSED, Efl_VG_Data *pd)
341{ 341{
342 return pd->name; 342 return pd->name;
343} 343}
344 344
345static void 345static void
346_efl_vg_base_eo_base_parent_set(Eo *obj, 346_efl_vg_eo_base_parent_set(Eo *obj,
347 Efl_VG_Base_Data *pd EINA_UNUSED, 347 Efl_VG_Data *pd EINA_UNUSED,
348 Eo *parent) 348 Eo *parent)
349{ 349{
350 Efl_VG_Container_Data *cd = NULL; 350 Efl_VG_Container_Data *cd = NULL;
@@ -366,7 +366,7 @@ _efl_vg_base_eo_base_parent_set(Eo *obj,
366 goto on_error; 366 goto on_error;
367 } 367 }
368 368
369 if (!_efl_vg_base_parent_checked_get(obj, &old_parent, &old_cd)) 369 if (!_efl_vg_parent_checked_get(obj, &old_parent, &old_cd))
370 { 370 {
371 ERR("Can't check the old parent of %p.", obj); 371 ERR("Can't check the old parent of %p.", obj);
372 goto on_error; 372 goto on_error;
@@ -385,12 +385,12 @@ _efl_vg_base_eo_base_parent_set(Eo *obj,
385 { 385 {
386 cd->children = eina_list_append(cd->children, obj); 386 cd->children = eina_list_append(cd->children, obj);
387 387
388 _efl_vg_base_name_insert(obj, pd, cd); 388 _efl_vg_name_insert(obj, pd, cd);
389 } 389 }
390 390
391 _efl_vg_base_changed(old_parent); 391 _efl_vg_changed(old_parent);
392 _efl_vg_base_changed(obj); 392 _efl_vg_changed(obj);
393 _efl_vg_base_changed(parent); 393 _efl_vg_changed(parent);
394 394
395 return ; 395 return ;
396 396
@@ -399,7 +399,7 @@ _efl_vg_base_eo_base_parent_set(Eo *obj,
399} 399}
400 400
401static void 401static void
402_efl_vg_base_efl_gfx_stack_raise(Eo *obj, Efl_VG_Base_Data *pd EINA_UNUSED) 402_efl_vg_efl_gfx_stack_raise(Eo *obj, Efl_VG_Data *pd EINA_UNUSED)
403{ 403{
404 Efl_VG_Container_Data *cd; 404 Efl_VG_Container_Data *cd;
405 Eina_List *lookup, *next; 405 Eina_List *lookup, *next;
@@ -419,7 +419,7 @@ _efl_vg_base_efl_gfx_stack_raise(Eo *obj, Efl_VG_Base_Data *pd EINA_UNUSED)
419 cd->children = eina_list_remove_list(cd->children, lookup); 419 cd->children = eina_list_remove_list(cd->children, lookup);
420 cd->children = eina_list_append_relative_list(cd->children, obj, next); 420 cd->children = eina_list_append_relative_list(cd->children, obj, next);
421 421
422 _efl_vg_base_changed(parent); 422 _efl_vg_changed(parent);
423 return ; 423 return ;
424 424
425 on_error: 425 on_error:
@@ -427,8 +427,8 @@ _efl_vg_base_efl_gfx_stack_raise(Eo *obj, Efl_VG_Base_Data *pd EINA_UNUSED)
427} 427}
428 428
429static void 429static void
430_efl_vg_base_efl_gfx_stack_stack_above(Eo *obj, 430_efl_vg_efl_gfx_stack_stack_above(Eo *obj,
431 Efl_VG_Base_Data *pd EINA_UNUSED, 431 Efl_VG_Data *pd EINA_UNUSED,
432 Efl_Gfx_Stack *above) 432 Efl_Gfx_Stack *above)
433{ 433{
434 Efl_VG_Container_Data *cd; 434 Efl_VG_Container_Data *cd;
@@ -449,7 +449,7 @@ _efl_vg_base_efl_gfx_stack_stack_above(Eo *obj,
449 cd->children = eina_list_remove_list(cd->children, lookup); 449 cd->children = eina_list_remove_list(cd->children, lookup);
450 cd->children = eina_list_append_relative_list(cd->children, obj, ref); 450 cd->children = eina_list_append_relative_list(cd->children, obj, ref);
451 451
452 _efl_vg_base_changed(parent); 452 _efl_vg_changed(parent);
453 return ; 453 return ;
454 454
455 on_error: 455 on_error:
@@ -457,8 +457,8 @@ _efl_vg_base_efl_gfx_stack_stack_above(Eo *obj,
457} 457}
458 458
459static void 459static void
460_efl_vg_base_efl_gfx_stack_stack_below(Eo *obj, 460_efl_vg_efl_gfx_stack_stack_below(Eo *obj,
461 Efl_VG_Base_Data *pd EINA_UNUSED, 461 Efl_VG_Data *pd EINA_UNUSED,
462 Efl_Gfx_Stack *below) 462 Efl_Gfx_Stack *below)
463{ 463{
464 Efl_VG_Container_Data *cd; 464 Efl_VG_Container_Data *cd;
@@ -479,7 +479,7 @@ _efl_vg_base_efl_gfx_stack_stack_below(Eo *obj,
479 cd->children = eina_list_remove_list(cd->children, lookup); 479 cd->children = eina_list_remove_list(cd->children, lookup);
480 cd->children = eina_list_prepend_relative_list(cd->children, obj, ref); 480 cd->children = eina_list_prepend_relative_list(cd->children, obj, ref);
481 481
482 _efl_vg_base_changed(parent); 482 _efl_vg_changed(parent);
483 return ; 483 return ;
484 484
485 on_error: 485 on_error:
@@ -487,7 +487,7 @@ _efl_vg_base_efl_gfx_stack_stack_below(Eo *obj,
487} 487}
488 488
489static void 489static void
490_efl_vg_base_efl_gfx_stack_lower(Eo *obj, Efl_VG_Base_Data *pd EINA_UNUSED) 490_efl_vg_efl_gfx_stack_lower(Eo *obj, Efl_VG_Data *pd EINA_UNUSED)
491{ 491{
492 Efl_VG_Container_Data *cd; 492 Efl_VG_Container_Data *cd;
493 Eina_List *lookup, *prev; 493 Eina_List *lookup, *prev;
@@ -507,7 +507,7 @@ _efl_vg_base_efl_gfx_stack_lower(Eo *obj, Efl_VG_Base_Data *pd EINA_UNUSED)
507 cd->children = eina_list_remove_list(cd->children, lookup); 507 cd->children = eina_list_remove_list(cd->children, lookup);
508 cd->children = eina_list_prepend_relative_list(cd->children, obj, prev); 508 cd->children = eina_list_prepend_relative_list(cd->children, obj, prev);
509 509
510 _efl_vg_base_changed(parent); 510 _efl_vg_changed(parent);
511 return ; 511 return ;
512 512
513 on_error: 513 on_error:
@@ -515,7 +515,7 @@ _efl_vg_base_efl_gfx_stack_lower(Eo *obj, Efl_VG_Base_Data *pd EINA_UNUSED)
515} 515}
516 516
517static Eo * 517static Eo *
518_efl_vg_base_root_parent_get(Eo *obj) 518_efl_vg_root_parent_get(Eo *obj)
519{ 519{
520 Eo *parent; 520 Eo *parent;
521 521
@@ -525,11 +525,11 @@ _efl_vg_base_root_parent_get(Eo *obj)
525 parent = eo_parent_get(obj); 525 parent = eo_parent_get(obj);
526 526
527 if (!parent) return NULL; 527 if (!parent) return NULL;
528 return _efl_vg_base_root_parent_get(parent); 528 return _efl_vg_root_parent_get(parent);
529} 529}
530 530
531static void 531static void
532_efl_vg_base_walk_down_at(Eo *root, Eina_Array *a, Eina_Rectangle *r) 532_efl_vg_walk_down_at(Eo *root, Eina_Array *a, Eina_Rectangle *r)
533{ 533{
534 Eina_Rectangle bounds; 534 Eina_Rectangle bounds;
535 535
@@ -546,23 +546,23 @@ _efl_vg_base_walk_down_at(Eo *root, Eina_Array *a, Eina_Rectangle *r)
546 546
547 cd = eo_data_scope_get(root, EFL_VG_CONTAINER_CLASS); 547 cd = eo_data_scope_get(root, EFL_VG_CONTAINER_CLASS);
548 EINA_LIST_FOREACH(cd->children, l, child) 548 EINA_LIST_FOREACH(cd->children, l, child)
549 _efl_vg_base_walk_down_at(child, a, r); 549 _efl_vg_walk_down_at(child, a, r);
550 } 550 }
551} 551}
552 552
553static void 553static void
554_efl_vg_base_object_at(Eo *obj, Eina_Array *a, Eina_Rectangle *r) 554_efl_vg_object_at(Eo *obj, Eina_Array *a, Eina_Rectangle *r)
555{ 555{
556 Eo *root; 556 Eo *root;
557 557
558 root = _efl_vg_base_root_parent_get(obj); 558 root = _efl_vg_root_parent_get(obj);
559 if (!root) return ; 559 if (!root) return ;
560 560
561 _efl_vg_base_walk_down_at(root, a, r); 561 _efl_vg_walk_down_at(root, a, r);
562} 562}
563 563
564static Efl_Gfx_Stack * 564static Efl_Gfx_Stack *
565_efl_vg_base_efl_gfx_stack_below_get(Eo *obj, Efl_VG_Base_Data *pd EINA_UNUSED) 565_efl_vg_efl_gfx_stack_below_get(Eo *obj, Efl_VG_Data *pd EINA_UNUSED)
566{ 566{
567 Eina_Rectangle r; 567 Eina_Rectangle r;
568 Eina_Array a; 568 Eina_Array a;
@@ -575,7 +575,7 @@ _efl_vg_base_efl_gfx_stack_below_get(Eo *obj, Efl_VG_Base_Data *pd EINA_UNUSED)
575 575
576 eina_array_step_set(&a, sizeof (Eina_Array), 8); 576 eina_array_step_set(&a, sizeof (Eina_Array), 8);
577 577
578 _efl_vg_base_object_at(obj, &a, &r); 578 _efl_vg_object_at(obj, &a, &r);
579 579
580 EINA_ARRAY_ITER_NEXT(&a, i, current, iterator) 580 EINA_ARRAY_ITER_NEXT(&a, i, current, iterator)
581 if (current == obj) 581 if (current == obj)
@@ -592,7 +592,7 @@ _efl_vg_base_efl_gfx_stack_below_get(Eo *obj, Efl_VG_Base_Data *pd EINA_UNUSED)
592} 592}
593 593
594static Efl_Gfx_Stack * 594static Efl_Gfx_Stack *
595_efl_vg_base_efl_gfx_stack_above_get(Eo *obj, Efl_VG_Base_Data *pd EINA_UNUSED) 595_efl_vg_efl_gfx_stack_above_get(Eo *obj, Efl_VG_Data *pd EINA_UNUSED)
596{ 596{
597 Eina_Rectangle r; 597 Eina_Rectangle r;
598 Eina_Array a; 598 Eina_Array a;
@@ -605,7 +605,7 @@ _efl_vg_base_efl_gfx_stack_above_get(Eo *obj, Efl_VG_Base_Data *pd EINA_UNUSED)
605 605
606 eina_array_step_set(&a, sizeof (Eina_Array), 8); 606 eina_array_step_set(&a, sizeof (Eina_Array), 8);
607 607
608 _efl_vg_base_object_at(obj, &a, &r); 608 _efl_vg_object_at(obj, &a, &r);
609 609
610 EINA_ARRAY_ITER_NEXT(&a, i, current, iterator) 610 EINA_ARRAY_ITER_NEXT(&a, i, current, iterator)
611 if (current == obj) 611 if (current == obj)
@@ -621,7 +621,7 @@ _efl_vg_base_efl_gfx_stack_above_get(Eo *obj, Efl_VG_Base_Data *pd EINA_UNUSED)
621} 621}
622 622
623static Efl_VG_Interpolation * 623static Efl_VG_Interpolation *
624_efl_vg_interpolation_get(Efl_VG_Base_Data *pd) 624_efl_vg_interpolation_get(Efl_VG_Data *pd)
625{ 625{
626 Eina_Matrix4 m; 626 Eina_Matrix4 m;
627 627
@@ -658,16 +658,16 @@ _efl_vg_interpolate_point(Eina_Point_3D *d,
658} 658}
659 659
660static Eina_Bool 660static Eina_Bool
661_efl_vg_base_interpolate(Eo *obj, 661_efl_vg_interpolate(Eo *obj,
662 Efl_VG_Base_Data *pd, const Efl_VG_Base *from, const Efl_VG_Base *to, 662 Efl_VG_Data *pd, const Efl_VG *from, const Efl_VG *to,
663 double pos_map) 663 double pos_map)
664{ 664{
665 Efl_VG_Base_Data *fromd, *tod; 665 Efl_VG_Data *fromd, *tod;
666 double from_map; 666 double from_map;
667 Eina_Bool r = EINA_TRUE; 667 Eina_Bool r = EINA_TRUE;
668 668
669 fromd = eo_data_scope_get(from, EFL_VG_BASE_CLASS); 669 fromd = eo_data_scope_get(from, EFL_VG_CLASS);
670 tod = eo_data_scope_get(to, EFL_VG_BASE_CLASS); 670 tod = eo_data_scope_get(to, EFL_VG_CLASS);
671 from_map = 1.0 - pos_map; 671 from_map = 1.0 - pos_map;
672 672
673 eo_del(pd->renderer); 673 eo_del(pd->renderer);
@@ -730,27 +730,27 @@ _efl_vg_base_interpolate(Eo *obj,
730 r &= efl_vg_interpolate(pd->mask, fromd->mask, tod->mask, pos_map); 730 r &= efl_vg_interpolate(pd->mask, fromd->mask, tod->mask, pos_map);
731 } 731 }
732 732
733 _efl_vg_base_changed(obj); 733 _efl_vg_changed(obj);
734 734
735 return r; 735 return r;
736} 736}
737 737
738static void 738static void
739_efl_vg_base_dup(Eo *obj, Efl_VG_Base_Data *pd, const Efl_VG_Base *from) 739_efl_vg_dup(Eo *obj, Efl_VG_Data *pd, const Efl_VG *from)
740{ 740{
741 Efl_VG_Container_Data *cd = NULL; 741 Efl_VG_Container_Data *cd = NULL;
742 Efl_VG_Base_Data *fromd; 742 Efl_VG_Data *fromd;
743 Eo *parent = NULL; 743 Eo *parent = NULL;
744 744
745 fromd = eo_data_scope_get(from, EFL_VG_BASE_CLASS); 745 fromd = eo_data_scope_get(from, EFL_VG_CLASS);
746 if (pd->name != fromd->name) 746 if (pd->name != fromd->name)
747 { 747 {
748 eina_stringshare_del(pd->name); 748 eina_stringshare_del(pd->name);
749 pd->name = eina_stringshare_ref(fromd->name); 749 pd->name = eina_stringshare_ref(fromd->name);
750 } 750 }
751 751
752 _efl_vg_base_parent_checked_get(obj, &parent, &cd); 752 _efl_vg_parent_checked_get(obj, &parent, &cd);
753 if (cd) _efl_vg_base_name_insert(obj, pd, cd); 753 if (cd) _efl_vg_name_insert(obj, pd, cd);
754 754
755 if (pd->intp) 755 if (pd->intp)
756 { 756 {
@@ -789,7 +789,7 @@ _efl_vg_base_dup(Eo *obj, Efl_VG_Base_Data *pd, const Efl_VG_Base *from)
789 pd->a = fromd->a; 789 pd->a = fromd->a;
790 pd->visibility = fromd->visibility; 790 pd->visibility = fromd->visibility;
791 791
792 _efl_vg_base_changed(obj); 792 _efl_vg_changed(obj);
793} 793}
794 794
795EAPI Eina_Bool 795EAPI Eina_Bool
@@ -854,4 +854,4 @@ evas_vg_node_lower(Eo *obj)
854 efl_gfx_stack_lower(obj); 854 efl_gfx_stack_lower(obj);
855} 855}
856 856
857#include "efl_vg_base.eo.c" 857#include "efl_vg.eo.c"
diff --git a/src/lib/evas/canvas/evas_vg_private.h b/src/lib/evas/canvas/evas_vg_private.h
index ca0389d..fca6680 100644
--- a/src/lib/evas/canvas/evas_vg_private.h
+++ b/src/lib/evas/canvas/evas_vg_private.h
@@ -3,7 +3,7 @@
3 3
4#include <Ector.h> 4#include <Ector.h>
5 5
6typedef struct _Efl_VG_Base_Data Efl_VG_Base_Data; 6typedef struct _Efl_VG_Data Efl_VG_Data;
7typedef struct _Efl_VG_Container_Data Efl_VG_Container_Data; 7typedef struct _Efl_VG_Container_Data Efl_VG_Container_Data;
8typedef struct _Efl_VG_Gradient_Data Efl_VG_Gradient_Data; 8typedef struct _Efl_VG_Gradient_Data Efl_VG_Gradient_Data;
9typedef struct _Efl_VG_Interpolation Efl_VG_Interpolation; 9typedef struct _Efl_VG_Interpolation Efl_VG_Interpolation;
@@ -22,7 +22,7 @@ struct _Evas_VG_Data
22 Eina_Array cleanup; 22 Eina_Array cleanup;
23}; 23};
24 24
25struct _Efl_VG_Base_Data 25struct _Efl_VG_Data
26{ 26{
27 const char *name; 27 const char *name;
28 28
@@ -32,7 +32,7 @@ struct _Efl_VG_Base_Data
32 Efl_VG *mask; 32 Efl_VG *mask;
33 Ector_Renderer *renderer; 33 Ector_Renderer *renderer;
34 34
35 void (*render_pre)(Eo *obj, Eina_Matrix3 *parent, Ector_Surface *s, void *data, Efl_VG_Base_Data *nd); 35 void (*render_pre)(Eo *obj, Eina_Matrix3 *parent, Ector_Surface *s, void *data, Efl_VG_Data *nd);
36 void *data; 36 void *data;
37 37
38 double x, y; 38 double x, y;
@@ -67,14 +67,14 @@ struct _Efl_VG_Interpolation
67 Eina_Point_3D skew; 67 Eina_Point_3D skew;
68}; 68};
69 69
70static inline Efl_VG_Base_Data * 70static inline Efl_VG_Data *
71_evas_vg_render_pre(Efl_VG *child, Ector_Surface *s, Eina_Matrix3 *m) 71_evas_vg_render_pre(Efl_VG *child, Ector_Surface *s, Eina_Matrix3 *m)
72{ 72{
73 Efl_VG_Base_Data *child_nd = NULL; 73 Efl_VG_Data *child_nd = NULL;
74 74
75 // FIXME: Prevent infinite loop 75 // FIXME: Prevent infinite loop
76 if (child) 76 if (child)
77 child_nd = eo_data_scope_get(child, EFL_VG_BASE_CLASS); 77 child_nd = eo_data_scope_get(child, EFL_VG_CLASS);
78 if (child_nd) 78 if (child_nd)
79 child_nd->render_pre(child, m, s, child_nd->data, child_nd); 79 child_nd->render_pre(child, m, s, child_nd->data, child_nd);
80 80
@@ -82,7 +82,7 @@ _evas_vg_render_pre(Efl_VG *child, Ector_Surface *s, Eina_Matrix3 *m)
82} 82}
83 83
84static inline void 84static inline void
85_efl_vg_base_changed(Eo *obj) 85_efl_vg_changed(Eo *obj)
86{ 86{
87 eo_event_callback_call(obj, EFL_GFX_CHANGED, NULL); 87 eo_event_callback_call(obj, EFL_GFX_CHANGED, NULL);
88} 88}
diff --git a/src/lib/evas/canvas/evas_vg_root_node.c b/src/lib/evas/canvas/evas_vg_root_node.c
index 23ee194..9dc38d8 100644
--- a/src/lib/evas/canvas/evas_vg_root_node.c
+++ b/src/lib/evas/canvas/evas_vg_root_node.c
@@ -20,7 +20,7 @@ _evas_vg_root_node_render_pre(Eo *obj EINA_UNUSED,
20 Eina_Matrix3 *parent, 20 Eina_Matrix3 *parent,
21 Ector_Surface *s, 21 Ector_Surface *s,
22 void *data, 22 void *data,
23 Efl_VG_Base_Data *nd) 23 Efl_VG_Data *nd)
24{ 24{
25 Efl_VG_Container_Data *pd = data; 25 Efl_VG_Container_Data *pd = data;
26 Eina_List *l; 26 Eina_List *l;
@@ -36,7 +36,7 @@ static Eina_Bool
36_evas_vg_root_node_changed(void *data, const Eo_Event *event) 36_evas_vg_root_node_changed(void *data, const Eo_Event *event)
37{ 37{
38 Efl_VG_Root_Node_Data *pd = data; 38 Efl_VG_Root_Node_Data *pd = data;
39 Efl_VG_Base_Data *bd = eo_data_scope_get(event->obj, EFL_VG_BASE_CLASS); 39 Efl_VG_Data *bd = eo_data_scope_get(event->obj, EFL_VG_CLASS);
40 40
41 if (bd->changed) return EINA_TRUE; 41 if (bd->changed) return EINA_TRUE;
42 bd->changed = EINA_TRUE; 42 bd->changed = EINA_TRUE;
@@ -51,7 +51,7 @@ _efl_vg_root_node_eo_base_parent_set(Eo *obj,
51 Eo *parent) 51 Eo *parent)
52{ 52{
53 // Nice little hack, jump over parent parent_set in Efl_VG_Root 53 // Nice little hack, jump over parent parent_set in Efl_VG_Root
54 eo_parent_set(eo_super(obj, EFL_VG_BASE_CLASS), parent); 54 eo_parent_set(eo_super(obj, EFL_VG_CLASS), parent);
55 if (parent && !eo_isa(parent, EVAS_VG_CLASS)) 55 if (parent && !eo_isa(parent, EVAS_VG_CLASS))
56 { 56 {
57 ERR("Parent of VG_ROOT_NODE must be a VG_CLASS"); 57 ERR("Parent of VG_ROOT_NODE must be a VG_CLASS");
@@ -68,7 +68,7 @@ _efl_vg_root_node_eo_base_constructor(Eo *obj,
68 Efl_VG_Root_Node_Data *pd) 68 Efl_VG_Root_Node_Data *pd)
69{ 69{
70 Efl_VG_Container_Data *cd; 70 Efl_VG_Container_Data *cd;
71 Efl_VG_Base_Data *nd; 71 Efl_VG_Data *nd;
72 Eo *parent; 72 Eo *parent;
73 73
74 // We are copying here the code of the vg container to make it possible to 74 // We are copying here the code of the vg container to make it possible to
@@ -78,7 +78,7 @@ _efl_vg_root_node_eo_base_constructor(Eo *obj,
78 cd->names = eina_hash_stringshared_new(NULL); 78 cd->names = eina_hash_stringshared_new(NULL);
79 79
80 // Nice little hack, jump over parent constructor in Efl_VG_Root 80 // Nice little hack, jump over parent constructor in Efl_VG_Root
81 obj = eo_constructor(eo_super(obj, EFL_VG_BASE_CLASS)); 81 obj = eo_constructor(eo_super(obj, EFL_VG_CLASS));
82 parent = eo_parent_get(obj); 82 parent = eo_parent_get(obj);
83 efl_vg_name_set(obj, "root"); 83 efl_vg_name_set(obj, "root");
84 if (!eo_isa(parent, EVAS_VG_CLASS)) { 84 if (!eo_isa(parent, EVAS_VG_CLASS)) {
@@ -86,7 +86,7 @@ _efl_vg_root_node_eo_base_constructor(Eo *obj,
86 return NULL; 86 return NULL;
87 } 87 }
88 88
89 nd = eo_data_scope_get(obj, EFL_VG_BASE_CLASS); 89 nd = eo_data_scope_get(obj, EFL_VG_CLASS);
90 nd->render_pre = _evas_vg_root_node_render_pre; 90 nd->render_pre = _evas_vg_root_node_render_pre;
91 nd->data = cd; 91 nd->data = cd;
92 92
diff --git a/src/lib/evas/canvas/evas_vg_shape.c b/src/lib/evas/canvas/evas_vg_shape.c
index 527006a..80e4e03 100644
--- a/src/lib/evas/canvas/evas_vg_shape.c
+++ b/src/lib/evas/canvas/evas_vg_shape.c
@@ -17,7 +17,7 @@ struct _Efl_VG_Shape_Data
17}; 17};
18 18
19static void 19static void
20_efl_vg_shape_efl_vg_base_bounds_get(Eo *obj, 20_efl_vg_shape_efl_vg_bounds_get(Eo *obj,
21 Efl_VG_Shape_Data *pd EINA_UNUSED, 21 Efl_VG_Shape_Data *pd EINA_UNUSED,
22 Eina_Rectangle *r) 22 Eina_Rectangle *r)
23{ 23{
@@ -35,7 +35,7 @@ _efl_vg_shape_fill_set(Eo *obj EINA_UNUSED,
35 pd->fill = eo_ref(f); 35 pd->fill = eo_ref(f);
36 eo_unref(tmp); 36 eo_unref(tmp);
37 37
38 _efl_vg_base_changed(obj); 38 _efl_vg_changed(obj);
39} 39}
40 40
41static Efl_VG * 41static Efl_VG *
@@ -90,7 +90,7 @@ _efl_vg_shape_stroke_fill_set(Eo *obj EINA_UNUSED,
90 pd->stroke.fill = eo_ref(f); 90 pd->stroke.fill = eo_ref(f);
91 eo_unref(tmp); 91 eo_unref(tmp);
92 92
93 _efl_vg_base_changed(obj); 93 _efl_vg_changed(obj);
94} 94}
95 95
96static Efl_VG * 96static Efl_VG *
@@ -110,7 +110,7 @@ _efl_vg_shape_stroke_marker_set(Eo *obj EINA_UNUSED,
110 pd->stroke.marker = eo_ref(m); 110 pd->stroke.marker = eo_ref(m);
111 eo_unref(tmp); 111 eo_unref(tmp);
112 112
113 _efl_vg_base_changed(obj); 113 _efl_vg_changed(obj);
114} 114}
115 115
116static Efl_VG_Shape * 116static Efl_VG_Shape *
@@ -125,10 +125,10 @@ _efl_vg_shape_render_pre(Eo *obj EINA_UNUSED,
125 Eina_Matrix3 *parent, 125 Eina_Matrix3 *parent,
126 Ector_Surface *s, 126 Ector_Surface *s,
127 void *data, 127 void *data,
128 Efl_VG_Base_Data *nd) 128 Efl_VG_Data *nd)
129{ 129{
130 Efl_VG_Shape_Data *pd = data; 130 Efl_VG_Shape_Data *pd = data;
131 Efl_VG_Base_Data *fill, *stroke_fill, *stroke_marker, *mask; 131 Efl_VG_Data *fill, *stroke_fill, *stroke_marker, *mask;
132 double xn = nd->x, yn = nd->y ; 132 double xn = nd->x, yn = nd->y ;
133 133
134 if (!nd->changed) return ; 134 if (!nd->changed) return ;
@@ -163,7 +163,7 @@ _efl_vg_shape_render_pre(Eo *obj EINA_UNUSED,
163static Eo * 163static Eo *
164_efl_vg_shape_eo_base_constructor(Eo *obj, Efl_VG_Shape_Data *pd) 164_efl_vg_shape_eo_base_constructor(Eo *obj, Efl_VG_Shape_Data *pd)
165{ 165{
166 Efl_VG_Base_Data *nd; 166 Efl_VG_Data *nd;
167 167
168 obj = eo_constructor(eo_super(obj, MY_CLASS)); 168 obj = eo_constructor(eo_super(obj, MY_CLASS));
169 169
@@ -172,7 +172,7 @@ _efl_vg_shape_eo_base_constructor(Eo *obj, Efl_VG_Shape_Data *pd)
172 efl_gfx_shape_stroke_cap_set(obj, EFL_GFX_CAP_BUTT); 172 efl_gfx_shape_stroke_cap_set(obj, EFL_GFX_CAP_BUTT);
173 efl_gfx_shape_stroke_join_set(obj, EFL_GFX_JOIN_MITER); 173 efl_gfx_shape_stroke_join_set(obj, EFL_GFX_JOIN_MITER);
174 174
175 nd = eo_data_scope_get(obj, EFL_VG_BASE_CLASS); 175 nd = eo_data_scope_get(obj, EFL_VG_CLASS);
176 nd->render_pre = _efl_vg_shape_render_pre; 176 nd->render_pre = _efl_vg_shape_render_pre;
177 nd->data = pd; 177 nd->data = pd;
178 178
@@ -186,9 +186,9 @@ _efl_vg_shape_eo_base_destructor(Eo *obj, Efl_VG_Shape_Data *pd EINA_UNUSED)
186} 186}
187 187
188static Eina_Bool 188static Eina_Bool
189_efl_vg_shape_efl_vg_base_interpolate(Eo *obj, 189_efl_vg_shape_efl_vg_interpolate(Eo *obj,
190 Efl_VG_Shape_Data *pd, 190 Efl_VG_Shape_Data *pd,
191 const Efl_VG_Base *from, const Efl_VG_Base *to, 191 const Efl_VG *from, const Efl_VG *to,
192 double pos_map) 192 double pos_map)
193{ 193{
194 Efl_VG_Shape_Data *fromd, *tod; 194 Efl_VG_Shape_Data *fromd, *tod;
@@ -218,7 +218,7 @@ _efl_vg_shape_efl_vg_base_interpolate(Eo *obj,
218} 218}
219 219
220static void 220static void
221_efl_vg_shape_efl_vg_base_dup(Eo *obj, Efl_VG_Shape_Data *pd EINA_UNUSED, const Efl_VG_Base *from) 221_efl_vg_shape_efl_vg_dup(Eo *obj, Efl_VG_Shape_Data *pd EINA_UNUSED, const Efl_VG *from)
222{ 222{
223 Efl_VG_Shape_Data *fromd; 223 Efl_VG_Shape_Data *fromd;
224 Eo *parent; 224 Eo *parent;