cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b55c96fe0479448a9d220a8976d88c1aa0f9f63e
commit b55c96fe0479448a9d220a8976d88c1aa0f9f63e
Author: Cedric BAIL <ced...@osg.samsung.com>
Date: Thu Oct 19 16:07:39 2017 -0700
evas: propagate object data to evas_object_inform_call_resize instead of
fetching it again.
---
src/lib/evas/canvas/evas_map.c | 2 +-
src/lib/evas/canvas/evas_object_inform.c | 3 +--
src/lib/evas/canvas/evas_object_line.c | 2 +-
src/lib/evas/canvas/evas_object_main.c | 2 +-
src/lib/evas/canvas/evas_object_polygon.c | 4 ++--
src/lib/evas/canvas/evas_object_text.c | 6 +++---
src/lib/evas/canvas/evas_object_textgrid.c | 2 +-
src/lib/evas/include/evas_private.h | 2 +-
8 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/lib/evas/canvas/evas_map.c b/src/lib/evas/canvas/evas_map.c
index 0283762e2d..e05ad97323 100644
--- a/src/lib/evas/canvas/evas_map.c
+++ b/src/lib/evas/canvas/evas_map.c
@@ -17,7 +17,7 @@ _evas_map_calc_geom_change(Evas_Object *eo_obj)
}
}
evas_object_inform_call_move(eo_obj, obj);
- evas_object_inform_call_resize(eo_obj);
+ evas_object_inform_call_resize(eo_obj, obj);
}
void
diff --git a/src/lib/evas/canvas/evas_object_inform.c
b/src/lib/evas/canvas/evas_object_inform.c
index cf180b14e0..3daffaaa2c 100644
--- a/src/lib/evas/canvas/evas_object_inform.c
+++ b/src/lib/evas/canvas/evas_object_inform.c
@@ -32,9 +32,8 @@ evas_object_inform_call_move(Evas_Object *eo_obj,
Evas_Object_Protected_Data *ob
}
void
-evas_object_inform_call_resize(Evas_Object *eo_obj)
+evas_object_inform_call_resize(Evas_Object *eo_obj, Evas_Object_Protected_Data
*obj)
{
- Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj,
EFL_CANVAS_OBJECT_CLASS);
int event_id = _evas_object_event_new();
evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_RESIZE, NULL,
event_id, EFL_GFX_EVENT_RESIZE);
diff --git a/src/lib/evas/canvas/evas_object_line.c
b/src/lib/evas/canvas/evas_object_line.c
index 4d588e0816..1790fbf8b1 100644
--- a/src/lib/evas/canvas/evas_object_line.c
+++ b/src/lib/evas/canvas/evas_object_line.c
@@ -176,7 +176,7 @@ _evas_line_xy_set(Eo *eo_obj, Evas_Line_Data *_pd,
Evas_Coord x1, Evas_Coord y1,
_evas_canvas_event_pointer_in_list_mouse_move_feed(obj->layer->evas, was,
eo_obj, obj, 1, 1, EINA_TRUE, NULL);
eina_list_free(was);
evas_object_inform_call_move(eo_obj, obj);
- evas_object_inform_call_resize(eo_obj);
+ evas_object_inform_call_resize(eo_obj, obj);
}
EOLIAN static void
diff --git a/src/lib/evas/canvas/evas_object_main.c
b/src/lib/evas/canvas/evas_object_main.c
index 323bc9041a..acc8de92d9 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -1537,7 +1537,7 @@ _efl_canvas_object_efl_gfx_size_set(Eo *eo_obj,
Evas_Object_Protected_Data *obj,
_evas_canvas_event_pointer_in_list_mouse_move_feed(obj->layer->evas,
was, eo_obj, obj, 1, 1, EINA_TRUE, NULL);
}
eina_list_free(was);
- evas_object_inform_call_resize(eo_obj);
+ evas_object_inform_call_resize(eo_obj, obj);
}
EOLIAN Eina_Rect
diff --git a/src/lib/evas/canvas/evas_object_polygon.c
b/src/lib/evas/canvas/evas_object_polygon.c
index bbf21f639a..bc135d90e4 100644
--- a/src/lib/evas/canvas/evas_object_polygon.c
+++ b/src/lib/evas/canvas/evas_object_polygon.c
@@ -190,7 +190,7 @@ _efl_canvas_polygon_point_add(Eo *eo_obj,
Efl_Canvas_Polygon_Data *_pd, Eina_Pos
_evas_canvas_event_pointer_in_list_mouse_move_feed(obj->layer->evas, was,
eo_obj, obj, 1, 1, EINA_TRUE, NULL);
eina_list_free(was);
evas_object_inform_call_move(eo_obj, obj);
- evas_object_inform_call_resize(eo_obj);
+ evas_object_inform_call_resize(eo_obj, obj);
}
EOLIAN static void
@@ -227,7 +227,7 @@ _efl_canvas_polygon_points_clear(Eo *eo_obj,
Efl_Canvas_Polygon_Data *_pd)
_evas_canvas_event_pointer_in_list_mouse_move_feed(obj->layer->evas, was,
eo_obj, obj, 1, 1, EINA_FALSE, NULL);
eina_list_free(was);
evas_object_inform_call_move(eo_obj, obj);
- evas_object_inform_call_resize(eo_obj);
+ evas_object_inform_call_resize(eo_obj, obj);
}
/* all nice and private */
diff --git a/src/lib/evas/canvas/evas_object_text.c
b/src/lib/evas/canvas/evas_object_text.c
index 5108aad00e..5cd0da45ce 100644
--- a/src/lib/evas/canvas/evas_object_text.c
+++ b/src/lib/evas/canvas/evas_object_text.c
@@ -462,7 +462,7 @@ _evas_text_font_reload(Eo *eo_obj, Evas_Text_Data *o)
if (!obj->layer->evas->is_frozen && !pass && !freeze && obj->cur->visible)
_evas_canvas_event_pointer_in_list_mouse_move_feed(obj->layer->evas, was,
eo_obj, obj, 1, 1, EINA_TRUE, NULL);
eina_list_free(was);
- evas_object_inform_call_resize(eo_obj);
+ evas_object_inform_call_resize(eo_obj, obj);
}
EOLIAN static void
@@ -1101,7 +1101,7 @@ _evas_text_efl_text_text_set(Eo *eo_obj, Evas_Text_Data
*o, const char *_text)
if (obj->cur->visible)
_evas_canvas_event_pointer_in_list_mouse_move_feed(obj->layer->evas, was,
eo_obj, obj, 1, 1, EINA_FALSE, NULL);
eina_list_free(was);
- evas_object_inform_call_resize(eo_obj);
+ evas_object_inform_call_resize(eo_obj, obj);
}
EOLIAN static void
@@ -2255,7 +2255,7 @@ _evas_object_text_rehint(Evas_Object *eo_obj)
if (obj->cur->visible)
_evas_canvas_event_pointer_in_list_mouse_move_feed(obj->layer->evas, was,
eo_obj, obj, 1, 1, EINA_FALSE, NULL);
eina_list_free(was);
- evas_object_inform_call_resize(eo_obj);
+ evas_object_inform_call_resize(eo_obj, obj);
}
static void
diff --git a/src/lib/evas/canvas/evas_object_textgrid.c
b/src/lib/evas/canvas/evas_object_textgrid.c
index 7f6dc76eb6..50a636d18b 100644
--- a/src/lib/evas/canvas/evas_object_textgrid.c
+++ b/src/lib/evas/canvas/evas_object_textgrid.c
@@ -1215,7 +1215,7 @@ _evas_textgrid_font_reload(Eo *eo_obj, Evas_Textgrid_Data
*o)
if (!obj->layer->evas->is_frozen && !pass && !freeze && obj->cur->visible)
_evas_canvas_event_pointer_in_list_mouse_move_feed(obj->layer->evas, was,
eo_obj, obj, 1, 1, EINA_TRUE, NULL);
eina_list_free(was);
- evas_object_inform_call_resize(eo_obj);
+ evas_object_inform_call_resize(eo_obj, obj);
o->changed = 1;
o->core_change = 1;
evas_object_textgrid_rows_clear(eo_obj);
diff --git a/src/lib/evas/include/evas_private.h
b/src/lib/evas/include/evas_private.h
index 9f82a55a42..049e707b40 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -1743,7 +1743,7 @@ void evas_event_callback_cleanup(Evas *e);
void evas_object_inform_call_show(Evas_Object *obj, Evas_Object_Protected_Data
*pd);
void evas_object_inform_call_hide(Evas_Object *obj, Evas_Object_Protected_Data
*pd);
void evas_object_inform_call_move(Evas_Object *obj, Evas_Object_Protected_Data
*pd);
-void evas_object_inform_call_resize(Evas_Object *obj);
+void evas_object_inform_call_resize(Evas_Object *obj,
Evas_Object_Protected_Data *pd);
void evas_object_inform_call_restack(Evas_Object *obj);
void evas_object_inform_call_changed_size_hints(Evas_Object *obj);
void evas_object_inform_call_image_preloaded(Evas_Object *obj);
--
