From fe05e5559b24c0df1616e2a7d1f7faefe5048bab Mon Sep 17 00:00:00 2001
From: Hermet Park <hermetpark@gmail.com>
Date: Fri, 28 Dec 2018 15:13:55 +0900
Subject: [PATCH] evas vg: stablizing parenting logic.

Cleaned up the case when null parent is coming.

and found out efl_data_scope_get() could return invalid data
when invalid CLASS type is given. it's handled as well.
---
 src/lib/evas/canvas/efl_canvas_vg_node.c   | 39 ++++++++++++----------
 src/lib/evas/canvas/efl_canvas_vg_object.c |  1 +
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/lib/evas/canvas/efl_canvas_vg_node.c b/src/lib/evas/canvas/efl_canvas_vg_node.c
index e5cc6c9776..a79de36962 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_node.c
+++ b/src/lib/evas/canvas/efl_canvas_vg_node.c
@@ -25,11 +25,11 @@ _node_change(Efl_VG *obj, Efl_Canvas_Vg_Node_Data *nd)
    Eo *p = obj;
    while ((p = efl_parent_get(p)))
      {
+        if (!efl_isa(p, MY_CLASS)) break;
         Efl_Canvas_Vg_Node_Data *pnd = efl_data_scope_get(p, MY_CLASS);
-        if (!pnd || (pnd->flags != EFL_GFX_CHANGE_FLAG_NONE)) break;
+        if (pnd->flags != EFL_GFX_CHANGE_FLAG_NONE) break;
         pnd->flags = EFL_GFX_CHANGE_FLAG_ALL;
      }
-
    efl_canvas_vg_object_change(nd->vd);
 }
 
@@ -327,23 +327,29 @@ _efl_canvas_vg_node_efl_object_parent_set(Eo *obj,
    Efl_Canvas_Vg_Container_Data *old_cd;
    Efl_VG *old_parent;
 
-   if (efl_isa(parent, EFL_CANVAS_VG_CONTAINER_CLASS))
-     cd = efl_data_scope_get(parent, EFL_CANVAS_VG_CONTAINER_CLASS);
-   else if (efl_isa(parent, EFL_CANVAS_VG_OBJECT_CLASS))
+   if (parent)
      {
-        if (nd->vg_obj != parent)
+        if (efl_isa(parent, EFL_CANVAS_VG_CONTAINER_CLASS))
+          cd = efl_data_scope_get(parent, EFL_CANVAS_VG_CONTAINER_CLASS);
+        else if (efl_isa(parent, EFL_CANVAS_VG_OBJECT_CLASS))
           {
-             nd->vg_obj = parent;
-             nd->vd = efl_data_scope_get(parent, EFL_CANVAS_VG_OBJECT_CLASS);
-             efl_canvas_vg_container_vg_obj_update(obj, nd);
+             if (nd->vg_obj != parent)
+               {
+                  nd->vg_obj = parent;
+                  nd->vd = efl_data_scope_get(parent, EFL_CANVAS_VG_OBJECT_CLASS);
+               }
+          }
+        else
+          {
+             ERR("parent(%p, class = %s) is not allowed by vg node(%p).",
+                 parent, efl_class_name_get(efl_class_get(parent)), obj);
+             return;
           }
-
      }
-   else if (parent)
+   else
      {
-        ERR("parent(%p, class = %s) is not allowed by vg node(%p).",
-            parent, efl_class_name_get(efl_class_get(parent)), obj);
-        return;
+        nd->vg_obj = NULL;
+        nd->vd = NULL;
      }
 
    if (!_efl_canvas_vg_node_parent_checked_get(obj, &old_parent, &old_cd))
@@ -365,17 +371,14 @@ _efl_canvas_vg_node_efl_object_parent_set(Eo *obj,
         _efl_canvas_vg_node_name_insert(obj, cd);
 
         Efl_Canvas_Vg_Node_Data *parent_nd = efl_data_scope_get(parent, MY_CLASS);
-        _node_change(parent, parent_nd);
-
         if (nd->vg_obj != parent_nd->vg_obj)
           {
              nd->vg_obj = parent_nd->vg_obj;
              nd->vd = parent_nd->vd;
-             efl_canvas_vg_container_vg_obj_update(obj, nd);
           }
      }
 
-   _node_change(obj, nd);
+   if (parent) _node_change(obj, nd);
 }
 
 static void
diff --git a/src/lib/evas/canvas/efl_canvas_vg_object.c b/src/lib/evas/canvas/efl_canvas_vg_object.c
index ffbc3016b9..6b64b7a7fe 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_object.c
+++ b/src/lib/evas/canvas/efl_canvas_vg_object.c
@@ -347,6 +347,7 @@ static Efl_Object *
 _efl_canvas_vg_object_efl_object_finalize(Eo *obj, Efl_Canvas_Vg_Object_Data *pd)
 {
    Evas *e = evas_object_evas_get(obj);
+   efl_parent_set(pd->root, obj);
 
    // TODO: If we start to have to many Evas_Object_VG per canvas, it may be nice
    // to actually have one event per canvas and one array per canvas to.