e_blur: change e_view_parent_get into e_canvas_layer_view_tree_get

also change variable names view_tree into layer_tree

Change-Id: I6ad04bc4c265d880c361847c59b5b04e7273a53b

diff --git a/src/bin/server/e_blur.c b/src/bin/server/e_blur.c
index fb58dd1cd68ac81376970497e8b199e307c76075..ab1a80c6938e6652423f5114b397c70e166fcce4 100644 (file)
--- a/src/bin/server/e_blur.c
+++ b/src/bin/server/e_blur.c
@@ -128,11 +128,11 @@ static Eina_Bool blur_trace = EINA_FALSE;
 static void _e_blur_ec_set(E_Blur *blur, E_Client *ec);
 static void _e_blur_behind_ec_set(E_Blur_Behind *blur, E_Client *ec);
 
-static void _e_blur_rectangle_view_image_new(E_Blur_Rectangle *blur_rectangle, E_View_Tree *view_tree, const char *name);
+static void _e_blur_rectangle_view_image_new(E_Blur_Rectangle *blur_rectangle, E_View_Tree *layer_tree, const char *name);
 static void _e_blur_rectangle_view_image_free(E_Blur_Rectangle *blur_rectangle);
-static void _e_blur_rectangle_dim_rect_new(E_Blur_Rectangle *blur_rectangle, E_View_Tree *view_tree, const char *name);
+static void _e_blur_rectangle_dim_rect_new(E_Blur_Rectangle *blur_rectangle, E_View_Tree *layer_tree, const char *name);
 static void _e_blur_rectangle_dim_rect_free(E_Blur_Rectangle *blur_rectangle);
-static void _e_blur_rectangle_corner_radius_image_new(E_Blur_Rectangle *blur_rectangle, E_View_Tree *view_tree, const char *name);
+static void _e_blur_rectangle_corner_radius_image_new(E_Blur_Rectangle *blur_rectangle, E_View_Tree *layer_tree, const char *name);
 static void _e_blur_rectangle_corner_radius_image_free(E_Blur_Rectangle *blur_rectangle);
 
 static void
@@ -607,14 +607,14 @@ _e_blur_rectangle_cb_ds_tizen_blur_rectangle_destroy(struct wl_listener *listene
 }
 
 static void
-_e_blur_rectangle_view_image_new(E_Blur_Rectangle *blur_rectangle, E_View_Tree *view_tree, const char *name)
+_e_blur_rectangle_view_image_new(E_Blur_Rectangle *blur_rectangle, E_View_Tree *layer_tree, const char *name)
 {
    E_View_Image *view_image = NULL;
    E_View *img_view = NULL;
 
-   EINA_SAFETY_ON_NULL_RETURN(view_tree);
+   EINA_SAFETY_ON_NULL_RETURN(layer_tree);
 
-   view_image = e_view_image_filled_create(view_tree);
+   view_image = e_view_image_filled_create(layer_tree);
    EINA_SAFETY_ON_NULL_RETURN(view_image);
 
    e_view_image_snapshot_set(view_image, true);
@@ -635,20 +635,20 @@ _e_blur_rectangle_view_image_free(E_Blur_Rectangle *blur_rectangle)
 }
 
 static void
-_e_blur_rectangle_dim_rect_new(E_Blur_Rectangle *blur_rectangle, E_View_Tree *view_tree, const char *name)
+_e_blur_rectangle_dim_rect_new(E_Blur_Rectangle *blur_rectangle, E_View_Tree *layer_tree, const char *name)
 {
    E_View_Rect *dim_rect = NULL;
    E_View *dim_view = NULL;
    int dim_color[4];
 
-   EINA_SAFETY_ON_NULL_RETURN(view_tree);
+   EINA_SAFETY_ON_NULL_RETURN(layer_tree);
    EINA_SAFETY_ON_NULL_RETURN(_blur_manager->configs.dim_config);
    dim_color[0] = _blur_manager->configs.dim_config->color.r;
    dim_color[1] = _blur_manager->configs.dim_config->color.g;
    dim_color[2] = _blur_manager->configs.dim_config->color.b;
    dim_color[3] = _blur_manager->configs.dim_config->color.a;
 
-   dim_rect = e_view_rect_create(view_tree, 1, 1, dim_color);
+   dim_rect = e_view_rect_create(layer_tree, 1, 1, dim_color);
    EINA_SAFETY_ON_NULL_RETURN(dim_rect);
 
    dim_view = e_view_rect_view_get(dim_rect);
@@ -668,15 +668,15 @@ _e_blur_rectangle_dim_rect_free(E_Blur_Rectangle *blur_rectangle)
 }
 
 static void
-_e_blur_rectangle_corner_radius_image_new(E_Blur_Rectangle *blur_rectangle, E_View_Tree *view_tree, const char *name)
+_e_blur_rectangle_corner_radius_image_new(E_Blur_Rectangle *blur_rectangle, E_View_Tree *layer_tree, const char *name)
 {
    E_View_Image *corner_radius_image = NULL;
    E_View *corner_radius_view = NULL;
    unsigned int *pixels;
 
-   EINA_SAFETY_ON_NULL_RETURN(view_tree);
+   EINA_SAFETY_ON_NULL_RETURN(layer_tree);
 
-   corner_radius_image = e_view_image_filled_create(view_tree);
+   corner_radius_image = e_view_image_filled_create(layer_tree);
    EINA_SAFETY_ON_NULL_RETURN(corner_radius_image);
    corner_radius_view = e_view_image_view_get(corner_radius_image);
 
@@ -1018,7 +1018,7 @@ _e_blur_behind_cb_restack(struct wl_listener *listener, void *data)
    E_View *event_src_view = ((E_View_Event_Callback_Data *)data)->view;
    E_Blur_Behind *blur_behind;
    E_View_Tree *layer_tree;
-   E_View *img_view, *dim_view = NULL;
+   E_View *img_view = NULL, *dim_view = NULL;
 
    blur_behind = wl_container_of(listener, blur_behind, listener.restack);
 
@@ -1390,7 +1390,7 @@ e_blur_dim_config_set(E_Blur_Dim_Config *dim_config)
      {
         view_client = e_client_view_get(blur->ec);
         if (!view_client) continue;
-        view_client_tree = e_view_parent_get(e_view_client_view_get(view_client));
+        view_client_tree = e_canvas_layer_view_tree_get(e_comp_canvas_get(), e_view_layer_index_get(e_view_client_view_get(view_client)));
         if (!view_client_tree) continue;
         EINA_LIST_FOREACH(blur->blur_rectangles, ll, blur_rectangle)
           {
@@ -1424,7 +1424,7 @@ e_blur_dim_config_set(E_Blur_Dim_Config *dim_config)
      {
         view_client = e_client_view_get(blur_behind->ec);
         if (!view_client) continue;
-        view_client_tree = e_view_parent_get(e_view_client_view_get(view_client));
+        view_client_tree = e_canvas_layer_view_tree_get(e_comp_canvas_get(), e_view_layer_index_get(e_view_client_view_get(view_client)));
         if (!view_client_tree) continue;
         blur_rectangle = blur_behind->blur_rectangle;
         if (after_enabled)