We don't flatten or unflatten SkPaintOptionsAndroid. Reproduce and fix.

src/core/SkPaint.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkPaint.h"
 #include "SkAnnotation.h"
@@ skipping 1985 matching lines @@
 
 static uint32_t pack_4(unsigned a, unsigned b, unsigned c, unsigned d) {
     SkASSERT(a == (uint8_t)a);
     SkASSERT(b == (uint8_t)b);
     SkASSERT(c == (uint8_t)c);
     SkASSERT(d == (uint8_t)d);
     return (a << 24) | (b << 16) | (c << 8) | d;
 }
 
 enum FlatFlags {
-    kHasTypeface_FlatFlag   = 0x01,
-    kHasEffects_FlatFlag    = 0x02,
+    kHasTypeface_FlatFlag            = 0x01,
+    kHasEffects_FlatFlag             = 0x02,
+    kHasPaintOptionsAndroid_FlatFlag = 0x04,
 };
 
 // The size of a flat paint's POD fields
 // Include an SkScalar for hinting scale factor whether it is
 // supported or not so that an SKP is valid whether it was
 // created with support or not.
 
 static const uint32_t kPODPaintSize =   6 * sizeof(SkScalar) +
                                         1 * sizeof(SkColor) +
                                         1 * sizeof(uint16_t) +
@@ skipping 11 matching lines @@
         asint(this->getShader()) |
         asint(this->getXfermode()) |
         asint(this->getMaskFilter()) |
         asint(this->getColorFilter()) |
         asint(this->getRasterizer()) |
         asint(this->getLooper()) |
         asint(this->getAnnotation()) |
         asint(this->getImageFilter())) {
         flatFlags |= kHasEffects_FlatFlag;
     }
-
+#if SK_BUILD_FOR_ANDROID
+    flatFlags |= kHasPaintOptionsAndroid_FlatFlag;
+#endif
 
     if (buffer.isOrderedBinaryBuffer()) {
         SkASSERT(SkAlign4(kPODPaintSize) == kPODPaintSize);
         uint32_t* ptr = buffer.getOrderedBinaryBuffer()->reserve(kPODPaintSize);
 
         ptr = write_scalar(ptr, this->getTextSize());
         ptr = write_scalar(ptr, this->getTextScaleX());
         ptr = write_scalar(ptr, this->getTextSkewX());
         // Dummy value for obsolete hinting scale factor.  TODO: remove with next picture version
         ptr = write_scalar(ptr, SK_Scalar1);
@@ skipping 38 matching lines @@
         buffer.writeFlattenable(this->getPathEffect());
         buffer.writeFlattenable(this->getShader());
         buffer.writeFlattenable(this->getXfermode());
         buffer.writeFlattenable(this->getMaskFilter());
         buffer.writeFlattenable(this->getColorFilter());
         buffer.writeFlattenable(this->getRasterizer());
         buffer.writeFlattenable(this->getLooper());
         buffer.writeFlattenable(this->getImageFilter());
         buffer.writeFlattenable(this->getAnnotation());
     }
+#if SK_BUILD_FOR_ANDROID
+    this->getPaintOptionsAndroid().flatten(buffer);
+#endif
 }
 
 void SkPaint::unflatten(SkFlattenableReadBuffer& buffer) {
     fPrivFlags = 0;
 
     uint8_t flatFlags = 0;
     if (buffer.isOrderedBinaryBuffer()) {
         SkASSERT(SkAlign4(kPODPaintSize) == kPODPaintSize);
         const void* podData = buffer.getOrderedBinaryBuffer()->skip(kPODPaintSize);
         const uint32_t* pod = reinterpret_cast<const uint32_t*>(podData);
@@ skipping 65 matching lines @@
     } else {
         this->setPathEffect(NULL);
         this->setShader(NULL);
         this->setXfermode(NULL);
         this->setMaskFilter(NULL);
         this->setColorFilter(NULL);
         this->setRasterizer(NULL);
         this->setLooper(NULL);
         this->setImageFilter(NULL);
     }
+#if SK_BUILD_FOR_ANDROID
+    if (flatFlags & kHasPaintOptionsAndroid_FlatFlag) {
+        SkPaintOptionsAndroid options;
+        options.unflatten(buffer);
+        this->setPaintOptionsAndroid(options);
+    }
+#endif

[reed1, 2013/09/18 18:37:40]

need

#else // not android, need to eat these bytes
    uint32_t bytes = buffer.read32();
    buffer. skip(bytes);
#endif

 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkShader* SkPaint::setShader(SkShader* shader) {
     GEN_ID_INC_EVAL(shader != fShader);
     SkRefCnt_SafeAssign(fShader, shader);
     return shader;
 }
 
@@ skipping 380 matching lines @@
             case SkXfermode::kPlus_Mode:
                 return 0 == this->getAlpha();
             case SkXfermode::kDst_Mode:
                 return true;
             default:
                 break;
         }
     }
     return false;
 }