summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-06-10 15:55:28 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-06-10 16:01:42 +0900
commit3df8e89e9a898f5a4d0559659851c0a1866bd0fa (patch)
treef1691d5443f7d6dfdb2f8cdf5e12d3234b60f220
parent62b08178802c8c17d9c6a81eb8c3b0a05b6130d4 (diff)
Evas: Rename Evas.Filter to Efl.Canvas.Filter.Internal
Trying to hide the name Evas from the public EO API...
-rw-r--r--src/Makefile_Evas.am2
-rw-r--r--src/lib/evas/canvas/efl_canvas_filter_internal.eo (renamed from src/lib/evas/canvas/evas_filter.eo)7
-rw-r--r--src/lib/evas/canvas/efl_canvas_image_internal.eo8
-rw-r--r--src/lib/evas/canvas/evas_filter_mixin.c156
-rw-r--r--src/lib/evas/canvas/evas_image_private.h4
-rw-r--r--src/lib/evas/canvas/evas_object_image.c6
-rw-r--r--src/lib/evas/canvas/evas_object_text.c10
-rw-r--r--src/lib/evas/canvas/evas_text.eo8
8 files changed, 101 insertions, 100 deletions
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 4a2aeddde4..c1685ed15a 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -41,7 +41,7 @@ evas_eolian_pub_files = \
41 lib/evas/canvas/efl_canvas_surface_tbm.eo \ 41 lib/evas/canvas/efl_canvas_surface_tbm.eo \
42 lib/evas/canvas/efl_canvas_surface_x11.eo \ 42 lib/evas/canvas/efl_canvas_surface_x11.eo \
43 lib/evas/canvas/efl_canvas_surface_wayland.eo \ 43 lib/evas/canvas/efl_canvas_surface_wayland.eo \
44 lib/evas/canvas/evas_filter.eo \ 44 lib/evas/canvas/efl_canvas_filter_internal.eo \
45 lib/evas/canvas/evas_smart_clipped.eo \ 45 lib/evas/canvas/evas_smart_clipped.eo \
46 lib/evas/canvas/efl_event_input.eo \ 46 lib/evas/canvas/efl_event_input.eo \
47 lib/evas/canvas/efl_event_key.eo \ 47 lib/evas/canvas/efl_event_key.eo \
diff --git a/src/lib/evas/canvas/evas_filter.eo b/src/lib/evas/canvas/efl_canvas_filter_internal.eo
index 7812a2a0c8..200973b487 100644
--- a/src/lib/evas/canvas/evas_filter.eo
+++ b/src/lib/evas/canvas/efl_canvas_filter_internal.eo
@@ -1,8 +1,9 @@
1mixin Evas.Filter (Efl.Gfx.Filter, Eo.Base) 1mixin Efl.Canvas.Filter.Internal (Efl.Gfx.Filter, Eo.Base)
2{ 2{
3 [[Evas internal implementation of filters.]] 3 [[Evas internal implementation of filters.]]
4 4
5 eo_prefix: evas; 5 eo_prefix: evas;
6 data: Evas_Filter_Data;
6 7
7 methods { 8 methods {
8 @property filter_changed @protected { 9 @property filter_changed @protected {
@@ -22,11 +23,11 @@ mixin Evas.Filter (Efl.Gfx.Filter, Eo.Base)
22 } 23 }
23 } 24 }
24 filter_input_alpha @protected @virtual_pure { 25 filter_input_alpha @protected @virtual_pure {
25 [[Called by Evas.Filter to determine whether the input is alpha or rgba.]] 26 [[Called by Efl.Canvas.Filter.Internal to determine whether the input is alpha or rgba.]]
26 return: bool; 27 return: bool;
27 } 28 }
28 filter_input_render @protected @virtual_pure { 29 filter_input_render @protected @virtual_pure {
29 [[Called by Evas.Filter when the parent class must render the input. 30 [[Called by Efl.Canvas.Filter.Internal when the parent class must render the input.
30 ; 31 ;
31 ]] 32 ]]
32 return: bool; [[Indicates success from the object render function.]] 33 return: bool; [[Indicates success from the object render function.]]
diff --git a/src/lib/evas/canvas/efl_canvas_image_internal.eo b/src/lib/evas/canvas/efl_canvas_image_internal.eo
index 211e9bb584..22903aeeaa 100644
--- a/src/lib/evas/canvas/efl_canvas_image_internal.eo
+++ b/src/lib/evas/canvas/efl_canvas_image_internal.eo
@@ -1,4 +1,4 @@
1abstract Efl.Canvas.Image.Internal (Evas.Object, Evas.Filter, 1abstract Efl.Canvas.Image.Internal (Evas.Object, Efl.Canvas.Filter.Internal,
2 Efl.Image, Efl.Gfx.Buffer, 2 Efl.Image, Efl.Gfx.Buffer,
3 Efl.Gfx.Fill, Efl.Gfx.View, 3 Efl.Gfx.Fill, Efl.Gfx.View,
4 Efl.Orientation, Efl.Flipable, 4 Efl.Orientation, Efl.Flipable,
@@ -38,8 +38,8 @@ abstract Efl.Canvas.Image.Internal (Evas.Object, Evas.Filter,
38 Efl.Gfx.Fill.fill_auto.set; 38 Efl.Gfx.Fill.fill_auto.set;
39 Efl.Gfx.Filter.filter_program.set; 39 Efl.Gfx.Filter.filter_program.set;
40 Efl.Gfx.View.view_size.get; 40 Efl.Gfx.View.view_size.get;
41 Evas.Filter.filter_input_alpha; 41 Efl.Canvas.Filter.Internal.filter_input_alpha;
42 Evas.Filter.filter_input_render; 42 Efl.Canvas.Filter.Internal.filter_input_render;
43 Evas.Filter.filter_dirty; 43 Efl.Canvas.Filter.Internal.filter_dirty;
44 } 44 }
45} 45}
diff --git a/src/lib/evas/canvas/evas_filter_mixin.c b/src/lib/evas/canvas/evas_filter_mixin.c
index 4529d7b931..88168bc0fa 100644
--- a/src/lib/evas/canvas/evas_filter_mixin.c
+++ b/src/lib/evas/canvas/evas_filter_mixin.c
@@ -1,12 +1,12 @@
1#define EVAS_FILTER_PROTECTED 1#define EFL_CANVAS_FILTER_INTERNAL_PROTECTED
2 2
3#include "evas_common_private.h" 3#include "evas_common_private.h"
4#include "evas_private.h" 4#include "evas_private.h"
5#include "../../lib/efl/interfaces/efl_gfx_filter.eo.h" 5#include "../../lib/efl/interfaces/efl_gfx_filter.eo.h"
6#include "evas_filter.eo.h" 6#include "efl_canvas_filter_internal.eo.h"
7#include "evas_filter.h" 7#include "evas_filter.h"
8 8
9#define MY_CLASS EVAS_FILTER_MIXIN 9#define MY_CLASS EFL_CANVAS_FILTER_INTERNAL_MIXIN
10 10
11#define ENFN obj->layer->evas->engine.func 11#define ENFN obj->layer->evas->engine.func
12#define ENDT obj->layer->evas->engine.data.output 12#define ENDT obj->layer->evas->engine.data.output
@@ -193,7 +193,7 @@ evas_filter_object_render(Eo *eo_obj, Evas_Object_Protected_Data *obj,
193 obj->cur->clipper->cur->cache.clip.b, 193 obj->cur->clipper->cur->cache.clip.b,
194 obj->cur->clipper->cur->cache.clip.a); 194 obj->cur->clipper->cur->cache.clip.a);
195 else 195 else
196 ENFN->context_multiplier_unset(output, context); 196 ENFN->context_multiplier_unset(output, context);
197 197
198 if (!pd->data->chain) 198 if (!pd->data->chain)
199 { 199 {
@@ -354,8 +354,8 @@ evas_filter_object_render(Eo *eo_obj, Evas_Object_Protected_Data *obj,
354} 354}
355 355
356EOLIAN static void 356EOLIAN static void
357_evas_filter_efl_gfx_filter_filter_program_set(Eo *eo_obj, Evas_Filter_Data *pd, 357_efl_canvas_filter_internal_efl_gfx_filter_filter_program_set(Eo *eo_obj, Evas_Filter_Data *pd,
358 const char *code, const char *name) 358 const char *code, const char *name)
359{ 359{
360 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); 360 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
361 Evas_Filter_Program *pgm = NULL; 361 Evas_Filter_Program *pgm = NULL;
@@ -369,47 +369,47 @@ _evas_filter_efl_gfx_filter_filter_program_set(Eo *eo_obj, Evas_Filter_Data *pd,
369 369
370 evas_object_async_block(obj); 370 evas_object_async_block(obj);
371 fcow = FCOW_BEGIN(pd); 371 fcow = FCOW_BEGIN(pd);
372 { 372 {
373 // Parse filter program 373 // Parse filter program
374 evas_filter_program_del(fcow->chain); 374 evas_filter_program_del(fcow->chain);
375 eina_stringshare_replace(&fcow->name, name); 375 eina_stringshare_replace(&fcow->name, name);
376 if (code) 376 if (code)
377 { 377 {
378 alpha = evas_filter_input_alpha(eo_obj); 378 alpha = evas_filter_input_alpha(eo_obj);
379 pgm = evas_filter_program_new(fcow->name, alpha); 379 pgm = evas_filter_program_new(fcow->name, alpha);
380 evas_filter_program_source_set_all(pgm, fcow->sources); 380 evas_filter_program_source_set_all(pgm, fcow->sources);
381 evas_filter_program_data_set_all(pgm, fcow->data); 381 evas_filter_program_data_set_all(pgm, fcow->data);
382 evas_filter_program_state_set(pgm, eo_obj, obj, 382 evas_filter_program_state_set(pgm, eo_obj, obj,
383 fcow->state.cur.name, fcow->state.cur.value, 383 fcow->state.cur.name, fcow->state.cur.value,
384 fcow->state.next.name, fcow->state.next.value, 384 fcow->state.next.name, fcow->state.next.value,
385 fcow->state.pos); 385 fcow->state.pos);
386 if (!evas_filter_program_parse(pgm, code)) 386 if (!evas_filter_program_parse(pgm, code))
387 { 387 {
388 ERR("Parsing failed!"); 388 ERR("Parsing failed!");
389 evas_filter_program_del(pgm); 389 evas_filter_program_del(pgm);
390 pgm = NULL; 390 pgm = NULL;
391 } 391 }
392 } 392 }
393 fcow->chain = pgm; 393 fcow->chain = pgm;
394 fcow->changed = EINA_TRUE; 394 fcow->changed = EINA_TRUE;
395 fcow->invalid = (pgm == NULL); 395 fcow->invalid = (pgm == NULL);
396 eina_stringshare_replace(&fcow->code, code); 396 eina_stringshare_replace(&fcow->code, code);
397 } 397 }
398 FCOW_END(fcow, pd); 398 FCOW_END(fcow, pd);
399 399
400 evas_filter_dirty(eo_obj); 400 evas_filter_dirty(eo_obj);
401} 401}
402 402
403EOLIAN static void 403EOLIAN static void
404_evas_filter_efl_gfx_filter_filter_program_get(Eo *eo_obj EINA_UNUSED, Evas_Filter_Data *pd, const char **code, const char **name) 404_efl_canvas_filter_internal_efl_gfx_filter_filter_program_get(Eo *eo_obj EINA_UNUSED, Evas_Filter_Data *pd, const char **code, const char **name)
405{ 405{
406 if (code) *code = pd->data->code; 406 if (code) *code = pd->data->code;
407 if (name) *name = pd->data->name; 407 if (name) *name = pd->data->name;
408} 408}
409 409
410EOLIAN static void 410EOLIAN static void
411_evas_filter_efl_gfx_filter_filter_source_set(Eo *eo_obj, Evas_Filter_Data *pd, 411_efl_canvas_filter_internal_efl_gfx_filter_filter_source_set(Eo *eo_obj, Evas_Filter_Data *pd,
412 const char *name, Efl_Gfx *eo_source) 412 const char *name, Efl_Gfx *eo_source)
413{ 413{
414 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); 414 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
415 Evas_Filter_Proxy_Binding *pb, *pb_old = NULL; 415 Evas_Filter_Proxy_Binding *pb, *pb_old = NULL;
@@ -491,8 +491,8 @@ update:
491} 491}
492 492
493EOLIAN static Efl_Gfx * 493EOLIAN static Efl_Gfx *
494_evas_filter_efl_gfx_filter_filter_source_get(Eo *obj EINA_UNUSED, Evas_Filter_Data *pd, 494_efl_canvas_filter_internal_efl_gfx_filter_filter_source_get(Eo *obj EINA_UNUSED, Evas_Filter_Data *pd,
495 const char * name) 495 const char * name)
496{ 496{
497 Evas_Filter_Proxy_Binding *pb = eina_hash_find(pd->data->sources, name); 497 Evas_Filter_Proxy_Binding *pb = eina_hash_find(pd->data->sources, name);
498 if (!pb) return NULL; 498 if (!pb) return NULL;
@@ -500,10 +500,10 @@ _evas_filter_efl_gfx_filter_filter_source_get(Eo *obj EINA_UNUSED, Evas_Filter_D
500} 500}
501 501
502EOLIAN static void 502EOLIAN static void
503_evas_filter_efl_gfx_filter_filter_state_set(Eo *eo_obj, Evas_Filter_Data *pd, 503_efl_canvas_filter_internal_efl_gfx_filter_filter_state_set(Eo *eo_obj, Evas_Filter_Data *pd,
504 const char *cur_state, double cur_val, 504 const char *cur_state, double cur_val,
505 const char *next_state, double next_val, 505 const char *next_state, double next_val,
506 double pos) 506 double pos)
507{ 507{
508 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); 508 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
509 509
@@ -534,10 +534,10 @@ _evas_filter_efl_gfx_filter_filter_state_set(Eo *eo_obj, Evas_Filter_Data *pd,
534} 534}
535 535
536EOLIAN static void 536EOLIAN static void
537_evas_filter_efl_gfx_filter_filter_state_get(Eo *obj EINA_UNUSED, Evas_Filter_Data *pd, 537_efl_canvas_filter_internal_efl_gfx_filter_filter_state_get(Eo *obj EINA_UNUSED, Evas_Filter_Data *pd,
538 const char **cur_state, double *cur_val, 538 const char **cur_state, double *cur_val,
539 const char **next_state, double *next_val, 539 const char **next_state, double *next_val,
540 double *pos) 540 double *pos)
541{ 541{
542 if (cur_state) *cur_state = pd->data->state.cur.name; 542 if (cur_state) *cur_state = pd->data->state.cur.name;
543 if (cur_val) *cur_val = pd->data->state.cur.value; 543 if (cur_val) *cur_val = pd->data->state.cur.value;
@@ -547,8 +547,8 @@ _evas_filter_efl_gfx_filter_filter_state_get(Eo *obj EINA_UNUSED, Evas_Filter_Da
547} 547}
548 548
549EOLIAN static void 549EOLIAN static void
550_evas_filter_efl_gfx_filter_filter_padding_get(Eo *eo_obj EINA_UNUSED, Evas_Filter_Data *pd, 550_efl_canvas_filter_internal_efl_gfx_filter_filter_padding_get(Eo *eo_obj EINA_UNUSED, Evas_Filter_Data *pd,
551 int *l, int *r, int *t, int *b) 551 int *l, int *r, int *t, int *b)
552{ 552{
553 if (!pd->data->chain) 553 if (!pd->data->chain)
554 { 554 {
@@ -562,7 +562,7 @@ _evas_filter_efl_gfx_filter_filter_padding_get(Eo *eo_obj EINA_UNUSED, Evas_Filt
562} 562}
563 563
564EOLIAN static void 564EOLIAN static void
565_evas_filter_filter_changed_set(Eo *eo_obj EINA_UNUSED, Evas_Filter_Data *pd, Eina_Bool val) 565_efl_canvas_filter_internal_filter_changed_set(Eo *eo_obj EINA_UNUSED, Evas_Filter_Data *pd, Eina_Bool val)
566{ 566{
567 if ((evas_object_filter_cow_default != pd->data) && (pd->data->changed != val)) 567 if ((evas_object_filter_cow_default != pd->data) && (pd->data->changed != val))
568 { 568 {
@@ -573,7 +573,7 @@ _evas_filter_filter_changed_set(Eo *eo_obj EINA_UNUSED, Evas_Filter_Data *pd, Ei
573} 573}
574 574
575EOLIAN static void 575EOLIAN static void
576_evas_filter_filter_invalid_set(Eo *eo_obj EINA_UNUSED, Evas_Filter_Data *pd, Eina_Bool val) 576_efl_canvas_filter_internal_filter_invalid_set(Eo *eo_obj EINA_UNUSED, Evas_Filter_Data *pd, Eina_Bool val)
577{ 577{
578 if (pd->data->invalid != val) 578 if (pd->data->invalid != val)
579 { 579 {
@@ -584,7 +584,7 @@ _evas_filter_filter_invalid_set(Eo *eo_obj EINA_UNUSED, Evas_Filter_Data *pd, Ei
584} 584}
585 585
586EOLIAN static Eo_Base * 586EOLIAN static Eo_Base *
587_evas_filter_eo_base_constructor(Eo *eo_obj, Evas_Filter_Data *pd) 587_efl_canvas_filter_internal_eo_base_constructor(Eo *eo_obj, Evas_Filter_Data *pd)
588{ 588{
589 Eo *obj = NULL; 589 Eo *obj = NULL;
590 590
@@ -596,7 +596,7 @@ _evas_filter_eo_base_constructor(Eo *eo_obj, Evas_Filter_Data *pd)
596} 596}
597 597
598EOLIAN static void 598EOLIAN static void
599_evas_filter_eo_base_destructor(Eo *eo_obj, Evas_Filter_Data *pd) 599_efl_canvas_filter_internal_eo_base_destructor(Eo *eo_obj, Evas_Filter_Data *pd)
600{ 600{
601 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); 601 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
602 Evas_Filter_Data_Binding *db; 602 Evas_Filter_Data_Binding *db;
@@ -610,7 +610,7 @@ _evas_filter_eo_base_destructor(Eo *eo_obj, Evas_Filter_Data *pd)
610 if (!pd->data->async) 610 if (!pd->data->async)
611 ENFN->image_free(ENDT, pd->data->output); 611 ENFN->image_free(ENDT, pd->data->output);
612 else 612 else
613 evas_unref_queue_image_put(obj->layer->evas, pd->data->output); 613 evas_unref_queue_image_put(obj->layer->evas, pd->data->output);
614 } 614 }
615 eina_hash_free(pd->data->sources); 615 eina_hash_free(pd->data->sources);
616 EINA_INLIST_FOREACH_SAFE(pd->data->data, il, db) 616 EINA_INLIST_FOREACH_SAFE(pd->data->data, il, db)
@@ -637,9 +637,9 @@ finish:
637} 637}
638 638
639EOLIAN static void 639EOLIAN static void
640_evas_filter_efl_gfx_filter_filter_data_set(Eo *eo_obj, Evas_Filter_Data *pd, 640_efl_canvas_filter_internal_efl_gfx_filter_filter_data_set(Eo *eo_obj, Evas_Filter_Data *pd,
641 const char *name, const char *value, 641 const char *name, const char *value,
642 Eina_Bool execute) 642 Eina_Bool execute)
643{ 643{
644 Evas_Filter_Data_Binding *db, *found = NULL; 644 Evas_Filter_Data_Binding *db, *found = NULL;
645 Evas_Object_Filter_Data *fcow; 645 Evas_Object_Filter_Data *fcow;
@@ -662,33 +662,33 @@ _evas_filter_efl_gfx_filter_filter_data_set(Eo *eo_obj, Evas_Filter_Data *pd,
662 } 662 }
663 663
664 fcow = FCOW_BEGIN(pd); 664 fcow = FCOW_BEGIN(pd);
665 { 665 {
666 if (found) 666 if (found)
667 { 667 {
668 // Note: we are keeping references to NULL values here. 668 // Note: we are keeping references to NULL values here.
669 eina_stringshare_replace(&found->value, value); 669 eina_stringshare_replace(&found->value, value);
670 found->execute = execute; 670 found->execute = execute;
671 } 671 }
672 else if (value) 672 else if (value)
673 { 673 {
674 db = calloc(1, sizeof(Evas_Filter_Data_Binding)); 674 db = calloc(1, sizeof(Evas_Filter_Data_Binding));
675 db->name = eina_stringshare_add(name); 675 db->name = eina_stringshare_add(name);
676 db->value = eina_stringshare_add(value); 676 db->value = eina_stringshare_add(value);
677 db->execute = execute; 677 db->execute = execute;
678 fcow->data = eina_inlist_append(fcow->data, EINA_INLIST_GET(db)); 678 fcow->data = eina_inlist_append(fcow->data, EINA_INLIST_GET(db));
679 } 679 }
680 evas_filter_program_data_set_all(fcow->chain, fcow->data); 680 evas_filter_program_data_set_all(fcow->chain, fcow->data);
681 fcow->changed = 1; 681 fcow->changed = 1;
682 } 682 }
683 FCOW_END(fcow, pd); 683 FCOW_END(fcow, pd);
684 684
685 evas_filter_dirty(eo_obj); 685 evas_filter_dirty(eo_obj);
686} 686}
687 687
688EOLIAN static void 688EOLIAN static void
689_evas_filter_efl_gfx_filter_filter_data_get(Eo *obj EINA_UNUSED, Evas_Filter_Data *pd, 689_efl_canvas_filter_internal_efl_gfx_filter_filter_data_get(Eo *obj EINA_UNUSED, Evas_Filter_Data *pd,
690 const char *name, const char **value, 690 const char *name, const char **value,
691 Eina_Bool *execute) 691 Eina_Bool *execute)
692{ 692{
693 Evas_Filter_Data_Binding *db; 693 Evas_Filter_Data_Binding *db;
694 694
@@ -710,9 +710,9 @@ _evas_filter_efl_gfx_filter_filter_data_get(Eo *obj EINA_UNUSED, Evas_Filter_Dat
710} 710}
711 711
712EOLIAN static void * 712EOLIAN static void *
713_evas_filter_filter_output_buffer_get(Eo *obj EINA_UNUSED, Evas_Filter_Data *pd) 713_efl_canvas_filter_internal_filter_output_buffer_get(Eo *obj EINA_UNUSED, Evas_Filter_Data *pd)
714{ 714{
715 return pd->data->output; 715 return pd->data->output;
716} 716}
717 717
718#include "evas_filter.eo.c" 718#include "canvas/efl_canvas_filter_internal.eo.c"
diff --git a/src/lib/evas/canvas/evas_image_private.h b/src/lib/evas/canvas/evas_image_private.h
index 8d2263460b..3713d0e13e 100644
--- a/src/lib/evas/canvas/evas_image_private.h
+++ b/src/lib/evas/canvas/evas_image_private.h
@@ -5,7 +5,7 @@
5 * new efl_canvas classes (image, snapshot, proxy, ...) 5 * new efl_canvas classes (image, snapshot, proxy, ...)
6 */ 6 */
7 7
8#define EVAS_FILTER_PROTECTED 8#define EFL_CANVAS_FILTER_INTERNAL_PROTECTED
9#define EVAS_OBJECT_PROTECTED 9#define EVAS_OBJECT_PROTECTED
10 10
11#include "evas_common_private.h" 11#include "evas_common_private.h"
@@ -26,7 +26,7 @@
26#include "../common/evas_convert_yuv.h" 26#include "../common/evas_convert_yuv.h"
27 27
28#include "canvas/evas_image.eo.h" 28#include "canvas/evas_image.eo.h"
29#include "evas_filter.eo.h" 29#include "canvas/efl_canvas_filter_internal.eo.h"
30#include "evas_filter.h" 30#include "evas_filter.h"
31 31
32/* private struct for rectangle object internal data */ 32/* private struct for rectangle object internal data */
diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index adf7eca1ab..d17958115e 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -1621,7 +1621,7 @@ evas_process_dirty_pixels(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj,
1621} 1621}
1622 1622
1623EOLIAN static void 1623EOLIAN static void
1624_efl_canvas_image_internal_evas_filter_filter_dirty(Eo *eo_obj, Evas_Image_Data *o) 1624_efl_canvas_image_internal_efl_canvas_filter_internal_filter_dirty(Eo *eo_obj, Evas_Image_Data *o)
1625{ 1625{
1626 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); 1626 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1627 1627
@@ -1630,7 +1630,7 @@ _efl_canvas_image_internal_evas_filter_filter_dirty(Eo *eo_obj, Evas_Image_Data
1630} 1630}
1631 1631
1632EOLIAN static Eina_Bool 1632EOLIAN static Eina_Bool
1633_efl_canvas_image_internal_evas_filter_filter_input_alpha(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o EINA_UNUSED) 1633_efl_canvas_image_internal_efl_canvas_filter_internal_filter_input_alpha(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o EINA_UNUSED)
1634{ 1634{
1635 return EINA_FALSE; 1635 return EINA_FALSE;
1636} 1636}
@@ -1644,7 +1644,7 @@ _efl_canvas_image_internal_efl_gfx_filter_filter_program_set(Eo *obj, Evas_Image
1644} 1644}
1645 1645
1646EOLIAN static Eina_Bool 1646EOLIAN static Eina_Bool
1647_efl_canvas_image_internal_evas_filter_filter_input_render(Eo *eo_obj, Evas_Image_Data *o, 1647_efl_canvas_image_internal_efl_canvas_filter_internal_filter_input_render(Eo *eo_obj, Evas_Image_Data *o,
1648 void *_filter, void *context, 1648 void *_filter, void *context,
1649 int l, int r EINA_UNUSED, int t, int b EINA_UNUSED, 1649 int l, int r EINA_UNUSED, int t, int b EINA_UNUSED,
1650 Eina_Bool do_async) 1650 Eina_Bool do_async)
diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c
index 7e55f40d24..6491653b4c 100644
--- a/src/lib/evas/canvas/evas_object_text.c
+++ b/src/lib/evas/canvas/evas_object_text.c
@@ -1,10 +1,10 @@
1#define EVAS_FILTER_PROTECTED 1#define EFL_CANVAS_FILTER_INTERNAL_PROTECTED
2 2
3#include "evas_common_private.h" /* Includes evas_bidi_utils stuff. */ 3#include "evas_common_private.h" /* Includes evas_bidi_utils stuff. */
4#include "evas_private.h" 4#include "evas_private.h"
5 5
6#include "../efl/interfaces/efl_gfx_filter.eo.h" 6#include "../efl/interfaces/efl_gfx_filter.eo.h"
7#include "evas_filter.eo.h" 7#include "efl_canvas_filter_internal.eo.h"
8#include "evas_filter.h" 8#include "evas_filter.h"
9 9
10#define MY_CLASS EVAS_TEXT_CLASS 10#define MY_CLASS EVAS_TEXT_CLASS
@@ -1663,7 +1663,7 @@ evas_font_draw_async_check(Evas_Object_Protected_Data *obj,
1663/* ugly binding between evas_fitler_mixin.c and this object */ 1663/* ugly binding between evas_fitler_mixin.c and this object */
1664 1664
1665EOLIAN static void 1665EOLIAN static void
1666_evas_text_evas_filter_filter_dirty(Eo *eo_obj, Evas_Text_Data *o) 1666_evas_text_efl_canvas_filter_internal_filter_dirty(Eo *eo_obj, Evas_Text_Data *o)
1667{ 1667{
1668 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); 1668 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1669 1669
@@ -1674,13 +1674,13 @@ _evas_text_evas_filter_filter_dirty(Eo *eo_obj, Evas_Text_Data *o)
1674} 1674}
1675 1675
1676EOLIAN static Eina_Bool 1676EOLIAN static Eina_Bool
1677_evas_text_evas_filter_filter_input_alpha(Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o EINA_UNUSED) 1677_evas_text_efl_canvas_filter_internal_filter_input_alpha(Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o EINA_UNUSED)
1678{ 1678{
1679 return EINA_TRUE; 1679 return EINA_TRUE;
1680} 1680}
1681 1681
1682EOLIAN static Eina_Bool 1682EOLIAN static Eina_Bool
1683_evas_text_evas_filter_filter_input_render(Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o, 1683_evas_text_efl_canvas_filter_internal_filter_input_render(Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o,
1684 void *_filter, void *drawctx, 1684 void *_filter, void *drawctx,
1685 int l, int r EINA_UNUSED, int t, int b EINA_UNUSED, 1685 int l, int r EINA_UNUSED, int t, int b EINA_UNUSED,
1686 Eina_Bool do_async) 1686 Eina_Bool do_async)
diff --git a/src/lib/evas/canvas/evas_text.eo b/src/lib/evas/canvas/evas_text.eo
index 5f3738ccb9..3c33ba4d0b 100644
--- a/src/lib/evas/canvas/evas_text.eo
+++ b/src/lib/evas/canvas/evas_text.eo
@@ -1,4 +1,4 @@
1class Evas.Text (Evas.Object, Efl.Text, Efl.Text.Properties, Evas.Filter) 1class Evas.Text (Evas.Object, Efl.Text, Efl.Text.Properties, Efl.Canvas.Filter.Internal)
2{ 2{
3 legacy_prefix: evas_object_text; 3 legacy_prefix: evas_object_text;
4 eo_prefix: evas_obj_text; 4 eo_prefix: evas_obj_text;
@@ -261,9 +261,9 @@ class Evas.Text (Evas.Object, Efl.Text, Efl.Text.Properties, Evas.Filter)
261 Efl.Text.Properties.font_source.get; 261 Efl.Text.Properties.font_source.get;
262 Efl.Text.Properties.font_source.set; 262 Efl.Text.Properties.font_source.set;
263 Efl.Gfx.Filter.filter_program.set; 263 Efl.Gfx.Filter.filter_program.set;
264 Evas.Filter.filter_input_alpha; 264 Efl.Canvas.Filter.Internal.filter_input_alpha;
265 Evas.Filter.filter_input_render; 265 Efl.Canvas.Filter.Internal.filter_input_render;
266 Evas.Filter.filter_dirty; 266 Efl.Canvas.Filter.Internal.filter_dirty;
267 Evas.Object.paragraph_direction.set; 267 Evas.Object.paragraph_direction.set;
268 Evas.Object.paragraph_direction.get; 268 Evas.Object.paragraph_direction.get;
269 } 269 }