From 3dc553babe515fbf9bd042dd63a792e5de578ecd Mon Sep 17 00:00:00 2001 From: Chris Craik Date: Mon, 4 Feb 2013 12:45:13 -0800 Subject: [PATCH] Simplify display list logging, removing pointers Also fix save indents Change-Id: Ia1add83422fbc200b85fd6688f5be60292b0f178 --- libs/hwui/DisplayListOp.h | 2 +- libs/hwui/DisplayListRenderer.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/hwui/DisplayListOp.h b/libs/hwui/DisplayListOp.h index a4de56d52c6ba..6425b43dc015d 100644 --- a/libs/hwui/DisplayListOp.h +++ b/libs/hwui/DisplayListOp.h @@ -39,7 +39,7 @@ // Use OP_LOG for logging with arglist, OP_LOGS if just printing char* #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 { diff --git a/libs/hwui/DisplayListRenderer.cpp b/libs/hwui/DisplayListRenderer.cpp index 5cb629e62fb65..3208c70d1302e 100644 --- a/libs/hwui/DisplayListRenderer.cpp +++ b/libs/hwui/DisplayListRenderer.cpp @@ -264,7 +264,7 @@ void DisplayList::output(uint32_t level) { ALOGD("%*sStart display list (%p, %s, render=%d)", level * 2, "", this, 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); int flags = DisplayListOp::kOpLogFlag_Recurse; for (unsigned int i = 0; i < mDisplayListData->displayListOps.size(); i++) {