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

Commit d4cf7df1 authored by Chris Craik's avatar Chris Craik Committed by Android Git Automerger
Browse files

am e51ccb15: Merge "Simplify display list logging, removing pointers" 

# Via Android (Google) Code Review (1) and Chris Craik (1)
* commit 'e51ccb15':
  Simplify display list logging, removing pointers
parents 6325fdf8 e51ccb15

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++) {