Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e51ccb15 authored by Chris Craik's avatar Chris Craik Committed by Android (Google) Code Review
Browse files

Merge "Simplify display list logging, removing pointers"

parents 71e404d2 3dc553ba

libs/hwui/DisplayListOp.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -39,7 +39,7 @@ 




// Use OP_LOG for logging with arglist, OP_LOGS if just printing char*

// Use OP_LOG for logging with arglist, OP_LOGS if just printing char*

#define OP_LOGS(s) OP_LOG("%s", s)

#define OP_LOGS(s) OP_LOG("%s", s)

#define OP_LOG(s, ...) ALOGD( "%*s--%p " s, level * 2, "", this, __VA_ARGS__ )

#define OP_LOG(s, ...) ALOGD( "%*s" s, level * 2, "", __VA_ARGS__ )









namespace android {

namespace android {

libs/hwui/DisplayListRenderer.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -264,7 +264,7 @@ void DisplayList::output(uint32_t level) { 
    ALOGD("%*sStart display list (%p, %s, render=%d)", level * 2, "", this,

    ALOGD("%*sStart display list (%p, %s, render=%d)", level * 2, "", this,

            mName.string(), isRenderable());

            mName.string(), isRenderable());





    ALOGD("%*s%s %d", level * 4, "", "Save", SkCanvas::kMatrix_SaveFlag | SkCanvas::kClip_SaveFlag);

    ALOGD("%*s%s %d", level * 2, "", "Save", SkCanvas::kMatrix_SaveFlag | SkCanvas::kClip_SaveFlag);

    outputViewProperties(level);

    outputViewProperties(level);

    int flags = DisplayListOp::kOpLogFlag_Recurse;

    int flags = DisplayListOp::kOpLogFlag_Recurse;

    for (unsigned int i = 0; i < mDisplayListData->displayListOps.size(); i++) {

    for (unsigned int i = 0; i < mDisplayListData->displayListOps.size(); i++) {