diff options
| author | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-29 20:29:38 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-29 20:29:38 +0000 |
| commit | 80ef27cd54f3d271b508583401390d4171a53e6a (patch) | |
| tree | 283d15086a25c5a9dda1bf4db86da07379ba6be7 /pipe/SkGPipeRead.cpp | |
| parent | 3fa097fbe9b9b4e2cc1374ba6300cefdc8f80662 (diff) | |
| download | src-80ef27cd54f3d271b508583401390d4171a53e6a.tar.gz | |
Little changes to SkAnnotation in pipe:
- store size in the op data field rather than separately (saves 4 bytes);
- trim out a malloc/memcpy in each of read and write;
- remove unused enum value;
- use the right _unpackOp function;
- make sure we call needOpBytes().
BUG=
R=reed@google.com, scroggo@google.com
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/50523004
git-svn-id: http://skia.googlecode.com/svn/trunk/src@12007 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'pipe/SkGPipeRead.cpp')
| -rw-r--r-- | pipe/SkGPipeRead.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pipe/SkGPipeRead.cpp b/pipe/SkGPipeRead.cpp index 789c3ede..877d380d 100644 --- a/pipe/SkGPipeRead.cpp +++ b/pipe/SkGPipeRead.cpp @@ -691,13 +691,11 @@ static void annotation_rp(SkCanvas*, SkReader32* reader, uint32_t op32, SkGPipeState* state) { SkPaint* p = state->editPaint(); - if (SkToBool(PaintOp_unpackData(op32))) { - const size_t size = reader->readU32(); - SkAutoMalloc storage(size); - - reader->read(storage.get(), size); - SkOrderedReadBuffer buffer(storage.get(), size); + const size_t size = DrawOp_unpackData(op32); + if (size > 0) { + SkOrderedReadBuffer buffer(reader->skip(size), size); p->setAnnotation(SkNEW_ARGS(SkAnnotation, (buffer)))->unref(); + SkASSERT(buffer.offset() == size); } else { p->setAnnotation(NULL); } |