rvandegrift
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix wayland frame callback failure 

Turns out ecore_animator_add() can randomly pick the wrong canvas to use as
a tick source.  Using EFL_EVENT_ANIMATOR_TICK on the compositor evas instead
will ensure we don't accidentally pick an internal window for a tick source.

Fix T6070
This commit is contained in:
Derek Foreman 2017-09-22 17:00:25 -05:00
parent 9f6d50ddf8
commit 077ae06955
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/bin/e_comp_wl.c
View File

@ -2126,8 +2126,8 @@ _e_comp_wl_subsurface_commit_to_cache(E_Client *ec)
sdata->cached.has_data = EINA_TRUE; sdata->cached.has_data = EINA_TRUE;
} }
static Eina_Bool static void
_cb_early_frame_animator(void *data) _cb_early_frame_cb(void *data, const Efl_Event *event EINA_UNUSED)
{ {
E_Client *ec; E_Client *ec;
@ -2141,11 +2141,10 @@ _cb_early_frame_animator(void *data)
*/ */
if (ec->comp_data->early_frame++ > 15) if (ec->comp_data->early_frame++ > 15)
{ {
ec->comp_data->early_frame_animator = NULL;
ec->comp_data->early_frame = 0; ec->comp_data->early_frame = 0;
return EINA_FALSE; efl_event_callback_del(e_comp->evas, EFL_EVENT_ANIMATOR_TICK,
_cb_early_frame_cb, data);
} }
return EINA_TRUE;
} }
static void static void
@ -2153,15 +2152,16 @@ _e_comp_wl_surface_early_frame(E_Client *ec)
{ {
if (e_comp_object_damage_exists(ec->frame)) if (e_comp_object_damage_exists(ec->frame))
{ {
ecore_animator_del(ec->comp_data->early_frame_animator); efl_event_callback_del(e_comp->evas, EFL_EVENT_ANIMATOR_TICK,
ec->comp_data->early_frame_animator = NULL; _cb_early_frame_cb, ec);
ec->comp_data->early_frame = 0; ec->comp_data->early_frame = 0;
return; return;
} }
if (ec->on_post_updates) return; if (ec->on_post_updates) return;
if (!ec->comp_data->early_frame)
efl_event_callback_add(e_comp->evas, EFL_EVENT_ANIMATOR_TICK,
_cb_early_frame_cb, ec);
ec->comp_data->early_frame = 1; ec->comp_data->early_frame = 1;
if (ec->comp_data->early_frame_animator) return;
ec->comp_data->early_frame_animator = ecore_animator_add(_cb_early_frame_animator, ec);
} }
static void static void
@ -2532,8 +2532,8 @@ _e_comp_wl_client_cb_del(void *data EINA_UNUSED, E_Client *ec)
/* make sure this is a wayland client */ /* make sure this is a wayland client */
if (e_pixmap_type_get(ec->pixmap) != E_PIXMAP_TYPE_WL) return; if (e_pixmap_type_get(ec->pixmap) != E_PIXMAP_TYPE_WL) return;
ecore_animator_del(ec->comp_data->early_frame_animator); efl_event_callback_del(e_comp->evas, EFL_EVENT_ANIMATOR_TICK,
ec->comp_data->early_frame_animator = NULL; _cb_early_frame_cb, ec);
ec->comp_data->early_frame = 0; ec->comp_data->early_frame = 0;
if (ec == e_comp_wl->wl.client_ec) if (ec == e_comp_wl->wl.client_ec)

1
src/bin/e_comp_wl.h
View File

@ -359,7 +359,6 @@ struct _E_Comp_Wl_Client_Data
E_Comp_X_Client_Data *xwayland_data; E_Comp_X_Client_Data *xwayland_data;
#endif #endif
Ecore_Animator *early_frame_animator;
int early_frame; int early_frame;
Eina_Bool mapped : 1; Eina_Bool mapped : 1;