diff options
| author | Nick Kralevich <nnk@google.com> | 2014-12-10 11:03:40 -0800 |
|---|---|---|
| committer | Nick Kralevich <nnk@google.com> | 2014-12-10 11:03:40 -0800 |
| commit | 7668e78601a0260f8ca67ebec742fe30f3872db2 (patch) | |
| tree | e9999597b668c81bdf93c773b96c227dc062b7bc /libs/hwui/DisplayListOp.h | |
| parent | d64d68d9c1c56d98e06d86b7438c46b108855c3b (diff) | |
| parent | 3bae94d78ed4c078552df9817a1952129a725189 (diff) | |
| download | frameworks_base-7668e78601a0260f8ca67ebec742fe30f3872db2.zip frameworks_base-7668e78601a0260f8ca67ebec742fe30f3872db2.tar.gz frameworks_base-7668e78601a0260f8ca67ebec742fe30f3872db2.tar.bz2 | |
resolved conflicts for merge of 3bae94d7 to master
Change-Id: I381539b1494447d62290c492f2550840fe0b559c
Diffstat (limited to 'libs/hwui/DisplayListOp.h')
| -rw-r--r-- | libs/hwui/DisplayListOp.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libs/hwui/DisplayListOp.h b/libs/hwui/DisplayListOp.h index 7627163..8e341d9 100644 --- a/libs/hwui/DisplayListOp.h +++ b/libs/hwui/DisplayListOp.h @@ -684,7 +684,8 @@ public: } virtual void output(int level, uint32_t logFlags) const { - OP_LOG("Draw bitmap %p at %f %f", mBitmap, mLocalBounds.left, mLocalBounds.top); + OP_LOG("Draw bitmap %p at %f %f%s", mBitmap, mLocalBounds.left, mLocalBounds.top, + mEntry ? " using AssetAtlas" : ""); } virtual const char* name() { return "DrawBitmap"; } @@ -918,7 +919,8 @@ public: } virtual void output(int level, uint32_t logFlags) const { - OP_LOG("Draw patch " RECT_STRING, RECT_ARGS(mLocalBounds)); + OP_LOG("Draw patch " RECT_STRING "%s", RECT_ARGS(mLocalBounds), + mEntry ? " with AssetAtlas" : ""); } virtual const char* name() { return "DrawPatch"; } |