commit 89ff3dd5af99fb31931a63298617d9a91bff2ca6
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Oct 29 20:29:38 2013 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Oct 29 20:29:38 2013 +0000
tree 633d77d995d4f6829ac05e5f1bb38aad80a0e1b4
parent 7585479202f1fe0b6a0a9dcd27697b56154706f4

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@12007 2bbb7eff-a529-9590-31e7-b0007b416f81

src/pipe/SkGPipeRead.cpp

diff --git a/src/pipe/SkGPipeRead.cpp b/src/pipe/SkGPipeRead.cpp
index 789c3ed..877d380 100644
--- a/src/pipe/SkGPipeRead.cpp
+++ b/src/pipe/SkGPipeRead.cpp
@@ -691,13 +691,11 @@
                           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);
     }