discomfitor pushed a commit to branch efl-1.20. http://git.enlightenment.org/core/efl.git/commit/?id=a1caf4d11076846563db7dab1ab1f0c919e96a69
commit a1caf4d11076846563db7dab1ab1f0c919e96a69 Author: Mike Blumenkrantz <[email protected]> Date: Wed Aug 23 14:24:11 2017 -0400 evas image cache: break out preload complete notification code into function no functional changes --- src/lib/evas/cache/evas_cache_image.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/src/lib/evas/cache/evas_cache_image.c b/src/lib/evas/cache/evas_cache_image.c index 51b0bf1559..ec44a2112c 100644 --- a/src/lib/evas/cache/evas_cache_image.c +++ b/src/lib/evas/cache/evas_cache_image.c @@ -394,21 +394,10 @@ _evas_cache_image_async_heavy(void *data) } static void -_evas_cache_image_async_end(void *data) +_evas_cache_image_preloaded_notify(Image_Entry *ie) { - Image_Entry *ie = (Image_Entry *)data; - Image_Entry_Task *task; Evas_Cache_Target *tmp; - evas_cache_image_ref(ie); - ie->cache->preload = eina_list_remove(ie->cache->preload, ie); - ie->cache->pending = eina_list_remove(ie->cache->pending, ie); - ie->preload = NULL; - ie->flags.preload_done = ie->flags.loaded; - ie->flags.updated_data = 1; - - ie->flags.preload_pending = 0; - while ((tmp = ie->targets)) { ie->targets = (Evas_Cache_Target *) @@ -427,6 +416,24 @@ _evas_cache_image_async_end(void *data) } free(tmp); } +} + +static void +_evas_cache_image_async_end(void *data) +{ + Image_Entry *ie = (Image_Entry *)data; + Image_Entry_Task *task; + + evas_cache_image_ref(ie); + ie->cache->preload = eina_list_remove(ie->cache->preload, ie); + ie->cache->pending = eina_list_remove(ie->cache->pending, ie); + ie->preload = NULL; + ie->flags.preload_done = ie->flags.loaded; + ie->flags.updated_data = 1; + + ie->flags.preload_pending = 0; + + _evas_cache_image_preloaded_notify(ie); EINA_LIST_FREE(ie->tasks, task) if (task != &dummy_task) free(task); --
