Little changes to SkAnnotation in pipe:

src/pipe/SkGPipePriv.h

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 
@@ skipping 218 matching lines @@
     kMiter_PaintOp,     // arg scalar
 
     kEncoding_PaintOp,  // arg inline - text
     kHinting_PaintOp,   // arg inline - text
     kAlign_PaintOp,     // arg inline - text
     kTextSize_PaintOp,  // arg scalar - text
     kTextScaleX_PaintOp,// arg scalar - text
     kTextSkewX_PaintOp, // arg scalar - text
     kTypeface_PaintOp,  // arg inline (index) - text
 
-    kAnnotation_PaintOp,// arg SkAnnotation_flat, data=bool-has-size
-
     kFlatIndex_PaintOp, // flags=paintflat, data=index
 };
 
 #define PAINTOPS_OP_BITS     8
 #define PAINTOPS_FLAG_BITS   4
 #define PAINTOPS_DATA_BITS   20
 
 #define PAINTOPS_OP_MASK     ((1 << PAINTOPS_OP_BITS) - 1)
 #define PAINTOPS_FLAG_MASK   ((1 << PAINTOPS_FLAG_BITS) - 1)
 #define PAINTOPS_DATA_MASK   ((1 << PAINTOPS_DATA_BITS) - 1)
@@ skipping 27 matching lines @@
     SkASSERT(0 == (op & ~PAINTOPS_OP_MASK));
     SkASSERT(0 == (flags & ~PAINTOPS_FLAG_MASK));
     SkASSERT(0 == (data & ~PAINTOPS_DATA_MASK));
 
     return (op << (PAINTOPS_FLAG_BITS + PAINTOPS_DATA_BITS)) |
     (flags << PAINTOPS_DATA_BITS) |
     data;
 }
 
 #endif