From: Doyoun Kang Date: Wed, 15 Dec 2021 07:48:14 +0000 (+0900) Subject: e_comp_object: add ec information for CRI log X-Git-Tag: accepted/tizen/unified/20211216.155748^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=91dd77f2a7aa7a1955984fbdb8295084fd938805;p=platform%2Fupstream%2Fenlightenment.git e_comp_object: add ec information for CRI log Change-Id: I4bd11d15291fa7b386967c555d54020fa91fbadc Signed-off-by: Doyoun Kang --- diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index 99a5290..2b2d13c 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -599,7 +599,7 @@ _e_comp_object_layers_add(E_Comp_Object *cw, E_Comp_Object *above, E_Comp_Object if (below_ec) { if (e_comp->layers[cw->layer].obj == below_ec->frame) - CRI("ACK!"); + CRI("ACK! ec:%p", cw->ec); } } #endif @@ -1277,7 +1277,7 @@ _e_comp_object_done_defer(void *data, Evas_Object *obj EINA_UNUSED, const char * /* visible clients which have never been sized are a bug */ if ((!cw->ec->new_client) && (!cw->ec->changes.size) && ((cw->w < 0) || (cw->h < 0)) && (!strcmp(emission, "e,action,show,done"))) - CRI("ACK!"); + CRI("ACK! ec:%p", cw->ec); if (!_e_comp_object_animating_end(cw)) return; if (cw->animating) return; /* hide only after animation finishes to guarantee a full run of the animation */ @@ -1692,7 +1692,7 @@ _e_comp_intercept_resize(void *data, Evas_Object *obj, int w, int h) /* client geom never changes when shading since the client is never altered */ cw->ec->client.w = iw; cw->ec->client.h = ih; - if ((cw->ec->client.w < 0) || (cw->ec->client.h < 0)) CRI("WTF"); + if ((cw->ec->client.w < 0) || (cw->ec->client.h < 0)) CRI("WTF. ec:%p", cw->ec); } /* The size of non-compositing window can be changed, so there is a @@ -1893,7 +1893,7 @@ layer_set: if (evas_object_below_get(obj) == e_comp->layers[cw->layer].obj) { /* can't stack a client above its own layer marker */ - CRI("STACKING ERROR!!!"); + CRI("STACKING ERROR!!! ec:%p (cw->layer:%d, ec->layer:%d)", cw->ec, cw->layer, cw->ec->layer); } if (!cw->visible) return; e_comp_render_queue(); @@ -2125,7 +2125,7 @@ _e_comp_intercept_stack_helper(E_Comp_Object *cw, Evas_Object *stack, E_Comp_Obj if (e_comp->layers[cw->layer].obj) if (evas_object_below_get(cw->smart_obj) == e_comp->layers[cw->layer].obj) { - CRI("STACKING ERROR!!!"); + CRI("STACKING ERROR!!! ec:%p (cw->layer:%d, ec->layer:%d)", cw->ec, cw->layer, cw->ec->layer); } if (cw->ec->new_client || (!ecstack) || (ecstack->frame != o)) evas_object_data_del(cw->smart_obj, "client_restack"); @@ -2449,7 +2449,7 @@ _e_comp_intercept_show_helper(E_Comp_Object *cw) /* ensure that some kind of frame calc has occurred if there's a frame */ if (e_pixmap_is_x(ec->pixmap) && cw->frame_object && (ec->h == ec->client.h) && (ec->w == ec->client.w)) - CRI("ACK!"); + CRI("ACK! ec:%p", ec); /* force resize in case it hasn't happened yet, or just to update size */ evas_object_resize(cw->smart_obj, ec->w, ec->h); if ((cw->w < 1) || (cw->h < 1)) @@ -2621,7 +2621,7 @@ _e_comp_intercept_focus(void *data, Evas_Object *obj, Eina_Bool focus) } if (focus && ec->lock_focus_out) return; if (e_object_is_del(E_OBJECT(ec)) && focus) - CRI("CAN'T FOCUS DELETED CLIENT!"); + CRI("CAN'T FOCUS DELETED CLIENT! ec:%p", ec); /* filter focus setting based on current state */ if (focus) @@ -3233,7 +3233,7 @@ _e_comp_smart_show(Evas_Object *obj) cw->defer_hide = 0; cw->visible = 1; if ((cw->w < 0) || (cw->h < 0)) - CRI("ACK!"); + CRI("ACK! ec:%p", cw->ec); TRACE_DS_BEGIN(COMP:SMART SHOW); @@ -3386,7 +3386,7 @@ _e_comp_smart_resize(Evas_Object *obj, int w, int h) INTERNAL_ENTRY; - if (!cw->effect_obj) CRI("ACK!"); + if (!cw->effect_obj) CRI("ACK! ec:%p", cw->ec); TRACE_DS_BEGIN(COMP:SMART RESIZE); @@ -3409,7 +3409,7 @@ _e_comp_smart_resize(Evas_Object *obj, int w, int h) if (e_pixmap_size_get(cw->ec->pixmap, &pw, &ph) && (!cw->ec->override)) { if ((ww != pw) || (hh != ph)) - CRI("CW RSZ: %dx%d || PX: %dx%d", ww, hh, pw, ph); + CRI("CW RSZ: %dx%d || PX: %dx%d. ec:%p", ww, hh, pw, ph, cw->ec); } evas_object_resize(cw->effect_obj, tw, th); evas_object_resize(cw->default_input_obj, w, h); @@ -4169,7 +4169,7 @@ e_comp_object_frame_geometry_set(Evas_Object *obj, int l, int r, int t, int b) API_ENTRY; if (cw->frame_object) - CRI("ACK!"); + CRI("ACK! ec:%p", cw->ec); if ((cw->client_inset.l == l) && (cw->client_inset.r == r) && (cw->client_inset.t == t) && (cw->client_inset.b == b)) return; calc = cw->client_inset.calc; @@ -4505,7 +4505,7 @@ e_comp_object_render_update_add(Evas_Object *obj) if (cw->ec->input_only || (!cw->updates) || (!cw->redirected)) return; if (e_object_is_del(E_OBJECT(cw->ec))) - CRI("CAN'T RENDER A DELETED CLIENT!"); + CRI("CAN'T RENDER A DELETED CLIENT!!! ec:%p", cw->ec); if (!e_pixmap_usable_get(cw->ec->pixmap)) return; if (!cw->update) {