Evas masking: Fix major memory leak

The memory usage graph was going up and to the right!
I was told this is always a good thing!

... maybe not this time :)

Hopefully I didn't forget a case. An intense session of
genlist scrolling with masks all over the place and masks
of masks didn't show any glitch, crash or memory leak.

2 files changed, 24 insertions, 0 deletions

diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 65ed1893bb..bf8aac2bf4 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -179,6 +179,21 @@ evas_object_free(Evas_Object *eo_obj, int clean_layer)
           map_write->surface = NULL;
         EINA_COW_WRITE_END(evas_object_map_cow, obj->map, map_write);
      }
+   if (obj->mask->is_mask)
+     {
+        EINA_COW_WRITE_BEGIN(evas_object_mask_cow, obj->mask, Evas_Object_Mask_Data, mask)
+          mask->is_mask = EINA_FALSE;
+          mask->redraw = EINA_FALSE;
+          mask->is_alpha = EINA_FALSE;
+          mask->x = mask->y = mask->w = mask->h = 0;
+          if (mask->surface)
+            {
+               obj->layer->evas->engine.func->image_map_surface_free
+                     (obj->layer->evas->engine.data.output, mask->surface);
+               mask->surface = NULL;
+            }
+        EINA_COW_WRITE_END(evas_object_mask_cow, obj->mask, mask);
+     }
    evas_object_grabs_cleanup(eo_obj, obj);
    evas_object_intercept_cleanup(eo_obj);
    if (obj->smart.parent) was_smart_child = 1;
diff --git a/src/lib/evas/canvas/evas_render.c b/src/lib/evas/canvas/evas_render.c
index 18560bf583..d67a4e540f 100644
--- a/src/lib/evas/canvas/evas_render.c
+++ b/src/lib/evas/canvas/evas_render.c
@@ -1519,6 +1519,7 @@ evas_render_mapped(Evas_Public_Data *e, Evas_Object *eo_obj,
                }
              else
                {
+                  Eina_Bool unset_image_clip = EINA_FALSE;
                   RDI(level);
 
                   if (obj->cur->clipper)
@@ -1540,6 +1541,7 @@ evas_render_mapped(Evas_Public_Data *e, Evas_Object *eo_obj,
 
                             if (mask->mask->surface)
                               {
+                                 unset_image_clip = EINA_TRUE;
                                  e->engine.func->context_clip_image_set
                                        (e->engine.data.output, ctx,
                                         mask->mask->surface,
@@ -1551,6 +1553,11 @@ evas_render_mapped(Evas_Public_Data *e, Evas_Object *eo_obj,
                   obj->func->render(eo_obj, obj, obj->private_data,
                                     e->engine.data.output, ctx,
                                     surface, off_x, off_y, EINA_FALSE);
+                  if (unset_image_clip)
+                    {
+                       e->engine.func->context_clip_image_unset
+                             (e->engine.data.output, ctx);
+                    }
                }
              if (!use_mapped_ctx)
                e->engine.func->context_free(e->engine.data.output, ctx);
@@ -1808,6 +1815,8 @@ evas_render_mask_subrender(Evas_Public_Data *evas,
           mdata->is_alpha = EINA_TRUE;
        }
 
+     mdata->surface = ENFN->image_dirty_region(ENDT, mdata->surface, 0, 0, w, h);
+
      /* END OF HACK */
 
 end: