diff options
| author | John Reck <jreck@google.com> | 2014-12-09 15:38:38 -0800 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2014-12-09 15:38:38 -0800 |
| commit | 3bae94d78ed4c078552df9817a1952129a725189 (patch) | |
| tree | 1bea1dc942af9e6633c10fc36342574669377d98 /libs/hwui/DisplayListOp.h | |
| parent | 28089cc39b0247d5e854a1a44cd8af17464b9e36 (diff) | |
| parent | fe11126d23f7456b4ea1dffce30dac45173f63f0 (diff) | |
| download | frameworks_base-3bae94d78ed4c078552df9817a1952129a725189.zip frameworks_base-3bae94d78ed4c078552df9817a1952129a725189.tar.gz frameworks_base-3bae94d78ed4c078552df9817a1952129a725189.tar.bz2 | |
resolved conflicts for merge of fe11126d to lmp-mr1-dev-plus-aosp
Change-Id: I60bf82ff71d9af0d80e7da8856efb4641c85885b
Diffstat (limited to 'libs/hwui/DisplayListOp.h')
| -rw-r--r-- | libs/hwui/DisplayListOp.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libs/hwui/DisplayListOp.h b/libs/hwui/DisplayListOp.h index 46016d9..4afa2cf 100644 --- a/libs/hwui/DisplayListOp.h +++ b/libs/hwui/DisplayListOp.h @@ -719,8 +719,9 @@ public: pureTranslate, bounds, mPaint); } - virtual void output(int level, uint32_t /* logFlags */) const { - OP_LOG("Draw bitmap %p at %f %f", mBitmap, mLocalBounds.left, mLocalBounds.top); + virtual void output(int level, uint32_t logFlags) const { + OP_LOG("Draw bitmap %p at %f %f%s", mBitmap, mLocalBounds.left, mLocalBounds.top, + mEntry ? " using AssetAtlas" : ""); } virtual const char* name() { return "DrawBitmap"; } @@ -953,8 +954,9 @@ public: getPaint(renderer)); } - virtual void output(int level, uint32_t /* logFlags */) const { - OP_LOG("Draw patch " RECT_STRING, RECT_ARGS(mLocalBounds)); + virtual void output(int level, uint32_t logFlags) const { + OP_LOG("Draw patch " RECT_STRING "%s", RECT_ARGS(mLocalBounds), + mEntry ? " with AssetAtlas" : ""); } virtual const char* name() { return "DrawPatch"; } |