e_view: rename the value of E_View_Render_Op

Change-Id: I88dfe1fb761c8b5430bc79c8b60be2740ed02e4f

diff --git a/src/bin/compmgr/e_alpha_mask_rect.c b/src/bin/compmgr/e_alpha_mask_rect.c
index 285b94be24478314e9b8c4cb347bb3b342c8d033..b05480643f96da39ba499593bd98672f863fc6e7 100644 (file)
--- a/src/bin/compmgr/e_alpha_mask_rect.c
+++ b/src/bin/compmgr/e_alpha_mask_rect.c
@@ -210,7 +210,7 @@ e_alpha_mask_rect_create(E_Client *ec)
    /* This object doesn't care about mouse event. And It's also
     * to avoid events of mouse on the E_Client. */
    e_view_pass_events_set(view, true);
-   e_view_render_op_set(view, E_VIEW_RENDER_COPY);
+   e_view_render_op_set(view, E_VIEW_RENDER_OP_COPY);
    e_view_position_set(view, ec->x, ec->y);
    e_view_name_set(view, "below_bg_rectangle");
 

diff --git a/src/bin/compmgr/e_comp_canvas.c b/src/bin/compmgr/e_comp_canvas.c
index 8d0d52e67afc2e9dea0c1e187dffc54b01a19475..cb78b2cba1408fb5cadc232a869471e304a6bdac 100644 (file)
--- a/src/bin/compmgr/e_comp_canvas.c
+++ b/src/bin/compmgr/e_comp_canvas.c
@@ -265,7 +265,7 @@ e_comp_canvas_init(E_Comp_Screen *comp_screen)
    E_View_Rect *rect;
    E_View *view;
    E_View_Tree *layer_tree;
-   E_View_Render_Op opmode = E_VIEW_RENDER_BLEND;
+   E_View_Render_Op opmode = E_VIEW_RENDER_OP_BLEND;
    E_Comp *comp;
    Ecore_Evas *ee;
    E_Output *primary_output;
@@ -321,7 +321,7 @@ e_comp_canvas_init(E_Comp_Screen *comp_screen)
    color[3] = e_config->comp_canvas_bg.a;
 
    if (e_config->comp_canvas_bg.opmode == EVAS_RENDER_COPY)
-     opmode = E_VIEW_RENDER_COPY;
+     opmode = E_VIEW_RENDER_OP_COPY;
 
    layer_tree = e_canvas_layer_view_tree_get(comp->canvas, E_CANVAS_LAYER_BOTTOM);
    rect = e_view_rect_create(layer_tree, comp->w, comp->h, color);

diff --git a/src/bin/core/e_view_client.c b/src/bin/core/e_view_client.c
index 27dc49a7f3dabe22da5087822b17e76986e19320..001371b000b1ff873013b3756fc10b6d8374b26c 100644 (file)
--- a/src/bin/core/e_view_client.c
+++ b/src/bin/core/e_view_client.c
@@ -579,13 +579,13 @@ EINTERN E_View_Render_Op
 e_view_client_render_op_get(E_View_Client *client)
 {
    Evas_Render_Op evas_render_op;
-   E_View_Render_Op view_render_op = E_VIEW_RENDER_BLEND;
+   E_View_Render_Op view_render_op = E_VIEW_RENDER_OP_BLEND;
 
    if (client == NULL) return view_render_op;
 
    evas_render_op = e_comp_object_render_op_get(client->view.eo);
    if (evas_render_op == EVAS_RENDER_COPY)
-     view_render_op = E_VIEW_RENDER_COPY;
+     view_render_op = E_VIEW_RENDER_OP_COPY;
 
    return view_render_op;
 }
@@ -597,7 +597,7 @@ e_view_client_render_op_set(E_View_Client *client, E_View_Render_Op op)
 
    if (client == NULL) return;
 
-   if (op == E_VIEW_RENDER_COPY)
+   if (op == E_VIEW_RENDER_OP_COPY)
      render_op = EVAS_RENDER_COPY;
 
    e_comp_object_render_op_set(client->view.eo, render_op);

diff --git a/src/bin/displaymgr/e_hwc_window.c b/src/bin/displaymgr/e_hwc_window.c
index 8b56ddc269c01c801b2c673d0b7edfc0a4c887bc..7ade4c8b130748785c391eb5a6aad258189a3f62 100644 (file)
--- a/src/bin/displaymgr/e_hwc_window.c
+++ b/src/bin/displaymgr/e_hwc_window.c
@@ -947,7 +947,7 @@ _e_hwc_window_cb_render_op_set(struct wl_listener *listener, void *data)
    hwc_window = container_of(listener, E_Hwc_Window, render_op_set_listener);
    if (!hwc_window->ec) return;
 
-   if (e_view_client_render_op_get(e_client_view_get(hwc_window->ec)) != E_VIEW_RENDER_BLEND)
+   if (e_view_client_render_op_get(e_client_view_get(hwc_window->ec)) != E_VIEW_RENDER_OP_BLEND)
      e_hwc_window_restriction_set(hwc_window, E_HWC_WINDOW_RESTRICTION_BLEND_EQUATION);
    else
      e_hwc_window_restriction_unset(hwc_window, E_HWC_WINDOW_RESTRICTION_BLEND_EQUATION);
@@ -1114,7 +1114,7 @@ _e_hwc_window_restriction_init(E_Hwc_Window *hwc_window)
    else
      e_hwc_window_restriction_unset(hwc_window, E_HWC_WINDOW_RESTRICTION_IMAGE_FILTER);
 
-   if (e_view_client_render_op_get(e_client_view_get(hwc_window->ec)) != E_VIEW_RENDER_BLEND)
+   if (e_view_client_render_op_get(e_client_view_get(hwc_window->ec)) != E_VIEW_RENDER_OP_BLEND)
      e_hwc_window_restriction_set(hwc_window, E_HWC_WINDOW_RESTRICTION_BLEND_EQUATION);
    else
      e_hwc_window_restriction_unset(hwc_window, E_HWC_WINDOW_RESTRICTION_BLEND_EQUATION);
@@ -3553,7 +3553,7 @@ e_hwc_window_below_transparent_obj_set(E_Hwc_Window *hwc_window, Eina_Bool set)
 
         e_view_pass_events_set(view, true);
         e_view_place_below(view, ec_view);
-        e_view_render_op_set(view, E_VIEW_RENDER_COPY);
+        e_view_render_op_set(view, E_VIEW_RENDER_OP_COPY);
 
         e_view_position_set(view, hwc_window->ec->x, hwc_window->ec->y);
         e_view_name_set(view, "hwc_below_transparent_obj");

diff --git a/src/bin/server/e_blender.c b/src/bin/server/e_blender.c
index a9d3b39c28ff75bdec405688ed03874af2814c6b..d9a0ed45b76ebe0716822ac253d1fe77664bee6b 100644 (file)
--- a/src/bin/server/e_blender.c
+++ b/src/bin/server/e_blender.c
@@ -49,7 +49,7 @@ _e_blend_free(E_Blend *blend)
         view_client = e_client_view_get(ec);
         if (view_client)
           {
-             e_view_client_render_op_set(view_client, E_VIEW_RENDER_BLEND);
+             e_view_client_render_op_set(view_client, E_VIEW_RENDER_OP_BLEND);
              e_view_color_set(e_view_client_view_get(view_client), 255, 255, 255, 255);
           }
      }
@@ -94,9 +94,9 @@ _e_blend_cb_ds_tizen_blend_commit(struct wl_listener *listener, void *data)
    e_view_color_set(view, r, g, b, a);
 
    if (blend->equation == DS_TIZEN_BLEND_EQUATION_PREMULTIPLIED)
-     e_view_client_render_op_set(view_client, E_VIEW_RENDER_BLEND);
+     e_view_client_render_op_set(view_client, E_VIEW_RENDER_OP_BLEND);
    else if (blend->equation == DS_TIZEN_BLEND_EQUATION_NONE)
-     e_view_client_render_op_set(view_client, E_VIEW_RENDER_COPY);
+     e_view_client_render_op_set(view_client, E_VIEW_RENDER_OP_COPY);
 }
 
 static void

diff --git a/src/include/e_view.h b/src/include/e_view.h
index 3949acd0dfdc1cc5b10a70280a2d58922129585b..41f6af3457b45c1e6668859a9e70ebebc51a6b9d 100644 (file)
--- a/src/include/e_view.h
+++ b/src/include/e_view.h
@@ -50,8 +50,8 @@ typedef enum {
 } E_Canvas_Layer;
 
 typedef enum {
-   E_VIEW_RENDER_BLEND = 0,
-   E_VIEW_RENDER_COPY = 2,
+   E_VIEW_RENDER_OP_BLEND = 0,
+   E_VIEW_RENDER_OP_COPY = 2,
 } E_View_Render_Op;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////

diff --git a/tests/tc-e_view.cpp b/tests/tc-e_view.cpp
index b13d1463faacc9cc3fec05053e650314696e3978..4f3d788646dbcb31cbe7c2aa6872955bae8756b0 100644 (file)
--- a/tests/tc-e_view.cpp
+++ b/tests/tc-e_view.cpp
@@ -529,12 +529,12 @@ TEST_F(EViewTest, Test_E_View_Render_Op_Set_Get)
 
    EXPECT_CALL(*evasMock, evas_object_render_op_set(obj, EVAS_RENDER_COPY))
       .Times(1);
-   e_view_render_op_set(&view, E_VIEW_RENDER_COPY);
+   e_view_render_op_set(&view, E_VIEW_RENDER_OP_COPY);
 
    EXPECT_CALL(*evasMock, evas_object_render_op_get(obj))
       .Times(1)
       .WillOnce(Return(EVAS_RENDER_COPY));
-   EXPECT_EQ(E_VIEW_RENDER_COPY, e_view_render_op_get(&view));
+   EXPECT_EQ(E_VIEW_RENDER_OP_COPY, e_view_render_op_get(&view));
 
    free(obj);
 }