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

include/core/SkPaint.h

 
 
 /*
  * 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.
  */
 
 
 #ifndef SkPaint_DEFINED
 #define SkPaint_DEFINED
 
 #include "SkColor.h"
 #include "SkDrawLooper.h"
 #include "SkMatrix.h"
 #include "SkXfermode.h"
-#ifdef SK_BUILD_FOR_ANDROID

[reed1, 2013/09/19 19:10:20]

Why is this removed from the public header :(

[mtklein, 2013/09/19 19:14:24]

Hrm, well, you're right, the header itself logically only needs the include if
SK_BUILD_FOR_ANDROID is defined.  We can have if #ifdef'd here if you like then
unconditionally #include it in the .cpp ?  The status quo is that the .cpp was
relying on the transitive include from this .h.

[mtklein, 2013/09/19 19:28:01]

Done.

 #include "SkPaintOptionsAndroid.h"
-#endif
 
 class SkAnnotation;
 class SkAutoGlyphCache;
 class SkColorFilter;
 class SkDescriptor;
 struct SkDeviceProperties;
 class SkFlattenableReadBuffer;
 class SkFlattenableWriteBuffer;
 struct SkGlyph;
 struct SkRect;
@@ skipping 1048 matching lines @@
 #ifdef SK_BUILD_FOR_ANDROID
     SkPaintOptionsAndroid fPaintOptionsAndroid;
 
     // In order for the == operator to work properly this must be the last field
     // in the struct so that we can do a memcmp to this field's offset.
     uint32_t        fGenerationID;
 #endif
 };
 
 #endif