ee_wayland: Stop using manual_render_set
authorDerek Foreman <derekf@osg.samsung.com>
Thu, 12 Apr 2018 18:44:10 +0000 (13:44 -0500)
committerJiyoun Park <jy0703.park@samsung.com>
Mon, 25 Jun 2018 08:47:36 +0000 (17:47 +0900)
Now we use draw_block instead, so we don't accidentally stomp on other
code's usage of manual_render_set

fix T6834

Change-Id: I073dc71d56fa56e4ab2390503a66f820a6bcfa8c

src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c

index 74e6430..c446975 100644 (file)
@@ -132,7 +132,7 @@ _ecore_evas_wl_common_animator_register(Ecore_Evas *ee)
    edata->frame = ecore_wl2_window_frame_callback_add(edata->win,
                                                       _anim_cb_tick, ee);
    if (!ecore_wl2_window_pending_get(edata->win) && !ee->in_async_render &&
-       !ee->animator_ticked && !ee->animator_ran)
+       !ee->animator_ticked && !ee->animator_ran && !ee->draw_block)
      ecore_wl2_window_false_commit(edata->win);
    edata->ticking = EINA_TRUE;
 }
@@ -286,7 +286,7 @@ _ecore_evas_wl_common_cb_disconnect(void *data EINA_UNUSED, int type EINA_UNUSED
         wdata->defer_show = EINA_TRUE;
         ee->visible = EINA_FALSE;
         wdata->reset_pending = 1;
-        ecore_evas_manual_render_set(ee, 1);
+        ee->draw_block = EINA_TRUE;
         _ee_display_unset(ee);
      }
    return ECORE_CALLBACK_RENEW;
@@ -770,8 +770,8 @@ _ecore_evas_wl_common_cb_window_configure_complete(void *data EINA_UNUSED, int t
      ERR("Failed to set Evas Engine Info for '%s'", ee->driver);
 
    wdata = ee->engine.data;
+   ee->draw_block = EINA_FALSE;
    if (wdata->frame) ecore_evas_manual_render(ee);
-   ecore_evas_manual_render_set(ee, 0);
 
    return ECORE_CALLBACK_PASS_ON;
 }
@@ -3129,7 +3129,7 @@ _ee_cb_sync_done(void *data, int type EINA_UNUSED, void *event EINA_UNUSED)
 
         if (wdata->reset_pending)
           {
-             ecore_evas_manual_render_set(ee, 0);
+             ee->draw_block = EINA_FALSE;
           }
         if (evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
           {
@@ -3521,7 +3521,7 @@ _ecore_evas_wl_common_options_new_internal(const char *disp_name, unsigned int p
 
    ee_list = eina_list_append(ee_list, ee);
 
-   ecore_evas_manual_render_set(ee, 1);
+   ee->draw_block = EINA_TRUE;
 
    return ee;