Revert "evas: Optimize out a function call if not required"

This reverts commit 8cb3b79a82.
I shouldn't have pushed this. So wrong. Sorry about the noise.
This commit is contained in:
Jean-Philippe Andre 2016-08-10 15:30:50 +09:00
parent 8cb3b79a82
commit 0889444449
1 changed files with 3 additions and 8 deletions

View File

@ -265,7 +265,7 @@ evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data
/* new input events */
if (eo_event_desc)
{
Efl_Event_Flags *pevflags = NULL, evflags;
Efl_Event_Flags *pevflags = NULL;
#define EV_CASE(TYPE, NEWTYPE, Type) \
case EVAS_CALLBACK_ ## TYPE: \
@ -288,14 +288,9 @@ evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data
}
#undef EV_CASE
if (pevflags)
{
efl_event_flags_set(eo_event_info, *pevflags);
evflags = *pevflags;
}
if (pevflags) efl_event_flags_set(eo_event_info, *pevflags);
eo_event_callback_call(eo_obj, eo_event_desc, eo_event_info);
if (pevflags && (*pevflags != evflags))
*pevflags = efl_event_flags_get(eo_event_info);
if (pevflags) *pevflags = efl_event_flags_get(eo_event_info);
}
/* legacy callbacks - relying on Efl.Canvas.Object events */