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

cherry-pick of http://code.google.com/p/skia/source/detail?r=11472

bug: 11115961
Change-Id: I0ed8af0bdec006178e5e6bd1c0a0c4f1cb517961

gyp/core.gyp

@@ -76,9 +76,6 @@
           ],
         }],
         [ 'skia_os == "android"', {
-          'sources': [
-            '../src/core/SkPaintOptionsAndroid.cpp',
-          ],
           'dependencies': [
             'android_deps.gyp:cpu_features',
           ],

gyp/core.gypi

@@ -118,6 +118,7 @@
         '<(skia_src_path)/core/SkOrderedWriteBuffer.cpp',
         '<(skia_src_path)/core/SkPackBits.cpp',
         '<(skia_src_path)/core/SkPaint.cpp',
+        '<(skia_src_path)/core/SkPaintOptionsAndroid.cpp',
         '<(skia_src_path)/core/SkPaintPriv.cpp',
         '<(skia_src_path)/core/SkPaintPriv.h',
         '<(skia_src_path)/core/SkPath.cpp',

gyp/tests.gyp

@@ -22,6 +22,7 @@
       ],
       'sources': [
         '../tests/AAClipTest.cpp',
+        '../tests/AndroidPaintTest.cpp',
         '../tests/AnnotationTest.cpp',
         '../tests/ARGBImageEncoderTest.cpp',
         '../tests/AtomicTest.cpp',

include/core/SkPaintOptionsAndroid.h

@@ -13,8 +13,6 @@
 #include "SkTypes.h"
 #include "SkString.h"
 
-#ifdef SK_BUILD_FOR_ANDROID
-
 class SkFlattenableReadBuffer;
 class SkFlattenableWriteBuffer;
 
@@ -72,6 +70,10 @@ public:
         return *this;
     }
 
+    bool operator==(const SkPaintOptionsAndroid& b) const {
+        return !(*this != b);
+    }
+
     bool operator!=(const SkPaintOptionsAndroid& b) const {
         return fLanguage != b.fLanguage ||
                fFontVariant != b.fFontVariant ||
@@ -125,5 +127,4 @@ private:
     bool fUseFontFallbacks;
 };
 
-#endif // #ifdef SK_BUILD_FOR_ANDROID
 #endif // #ifndef SkPaintOptionsAndroid_DEFINED

src/core/SkPaint.cpp

@@ -21,6 +21,7 @@
 #include "SkOrderedReadBuffer.h"
 #include "SkOrderedWriteBuffer.h"
 #include "SkPaintDefaults.h"
+#include "SkPaintOptionsAndroid.h"
 #include "SkPathEffect.h"
 #include "SkRasterizer.h"
 #include "SkScalar.h"
@@ -2027,8 +2028,9 @@ static uint32_t pack_4(unsigned a, unsigned b, unsigned c, unsigned d) {
 }
 
 enum FlatFlags {
-    kHasTypeface_FlatFlag   = 0x01,
-    kHasEffects_FlatFlag    = 0x02,
+    kHasTypeface_FlatFlag                      = 0x01,
+    kHasEffects_FlatFlag                       = 0x02,
+    kHasNonDefaultPaintOptionsAndroid_FlatFlag = 0x04,
 };
 
 // The size of a flat paint's POD fields
@@ -2060,7 +2062,11 @@ void SkPaint::flatten(SkFlattenableWriteBuffer& buffer) const {
         asint(this->getImageFilter())) {
         flatFlags |= kHasEffects_FlatFlag;
     }
-
+#ifdef SK_BUILD_FOR_ANDROID
+    if (this->getPaintOptionsAndroid() != SkPaintOptionsAndroid()) {
+        flatFlags |= kHasNonDefaultPaintOptionsAndroid_FlatFlag;
+    }
+#endif
 
     if (buffer.isOrderedBinaryBuffer()) {
         SkASSERT(SkAlign4(kPODPaintSize) == kPODPaintSize);
@@ -2127,6 +2133,11 @@ void SkPaint::flatten(SkFlattenableWriteBuffer& buffer) const {
         buffer.writeFlattenable(this->getImageFilter());
         buffer.writeFlattenable(this->getAnnotation());
     }
+#ifdef SK_BUILD_FOR_ANDROID
+    if (flatFlags & kHasNonDefaultPaintOptionsAndroid_FlatFlag) {
+        this->getPaintOptionsAndroid().flatten(buffer);
+    }
+#endif
 }
 
 void SkPaint::unflatten(SkFlattenableReadBuffer& buffer) {
@@ -2220,6 +2231,17 @@ void SkPaint::unflatten(SkFlattenableReadBuffer& buffer) {
         this->setLooper(NULL);
         this->setImageFilter(NULL);
     }
+
+#ifdef SK_BUILD_FOR_ANDROID
+    this->setPaintOptionsAndroid(SkPaintOptionsAndroid());
+#endif
+    if (flatFlags & kHasNonDefaultPaintOptionsAndroid_FlatFlag) {
+        SkPaintOptionsAndroid options;
+        options.unflatten(buffer);
+#ifdef SK_BUILD_FOR_ANDROID
+        this->setPaintOptionsAndroid(options);
+#endif
+    }
 }
 
 ///////////////////////////////////////////////////////////////////////////////

src/core/SkPaintOptionsAndroid.cpp

@@ -12,14 +12,12 @@
 #include "SkThread.h"
 #include <cstring>
 
-#ifdef SK_BUILD_FOR_ANDROID
-
 SkLanguage SkLanguage::getParent() const {
     SkASSERT(!fTag.isEmpty());
     const char* tag = fTag.c_str();
 
     // strip off the rightmost "-.*"
-    char* parentTagEnd = strrchr(tag, '-');
+    const char* parentTagEnd = strrchr(tag, '-');
     if (parentTagEnd == NULL) {
         return SkLanguage();
     }
@@ -40,5 +38,3 @@ void SkPaintOptionsAndroid::unflatten(SkFlattenableReadBuffer& buffer) {
     fLanguage = SkLanguage(tag);
     fUseFontFallbacks = buffer.readBool();
 }
-
-#endif

tests/Android.mk

@@ -4,6 +4,7 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES:= \
   AAClipTest.cpp \
+  AndroidPaintTest.cpp \
   AtomicTest.cpp \
   BitmapCopyTest.cpp \
   BitmapGetColorTest.cpp \

tests/AndroidPaintTest.cpp

+// SkPaints only have an SkPaintOptionsAndroid if SK_BUILD_FOR_ANDROID is true.
+#ifdef SK_BUILD_FOR_ANDROID
+
+#include "SkPaintOptionsAndroid.h"
+#include "SkOrderedReadBuffer.h"
+#include "SkOrderedWriteBuffer.h"
+#include "SkPaint.h"
+#include "Test.h"
+#include "TestClassDef.h"
+
+static size_t Reconstruct(const SkPaint& src, SkPaint* dst) {
+    SkOrderedWriteBuffer writer(64 /*arbitrary*/);
+    src.flatten(writer);
+
+    const size_t size = writer.bytesWritten();
+    SkAutoMalloc bytes(size);
+    writer.writeToMemory(bytes.get());
+
+    SkOrderedReadBuffer reader(bytes.get(), size);
+    dst->unflatten(reader);
+
+    return size;
+}
+
+static void android_options_serialization(skiatest::Reporter* reporter) {
+    // We want to make sure that Android's paint options survive a flatten/unflatten round trip.
+    // These are all non-default options.
+    SkPaintOptionsAndroid options;
+    options.setLanguage("ja-JP");
+    options.setFontVariant(SkPaintOptionsAndroid::kElegant_Variant);
+    options.setUseFontFallbacks(true);
+
+    SkPaint paint;
+    paint.setPaintOptionsAndroid(options);
+
+    SkPaint reconstructed;
+    Reconstruct(paint, &reconstructed);
+
+    REPORTER_ASSERT(reporter, options == reconstructed.getPaintOptionsAndroid());
+}
+DEFINE_TESTCLASS_SHORT(android_options_serialization);
+
+static void android_options_serialization_reverse(skiatest::Reporter* reporter) {
+    // Opposite test of above: make sure the serialized default values of a paint overwrite
+    // non-default values on the paint we're unflattening into.
+    const SkPaint defaultOptions;
+
+    SkPaintOptionsAndroid options;
+    options.setLanguage("ja-JP");
+    options.setFontVariant(SkPaintOptionsAndroid::kElegant_Variant);
+    options.setUseFontFallbacks(true);
+    SkPaint nonDefaultOptions;
+    nonDefaultOptions.setPaintOptionsAndroid(options);
+
+    Reconstruct(defaultOptions, &nonDefaultOptions);
+
+    REPORTER_ASSERT(reporter,
+            defaultOptions.getPaintOptionsAndroid() ==
+            nonDefaultOptions.getPaintOptionsAndroid());
+}
+DEFINE_TESTCLASS_SHORT(android_options_serialization_reverse);
+
+static void android_options_size(skiatest::Reporter* reporter) {
+    // A paint with default android options should serialize to something smaller than
+    // a paint with non-default android options.
+
+    SkPaint defaultOptions;
+
+    SkPaintOptionsAndroid options;
+    options.setUseFontFallbacks(true);
+    SkPaint nonDefaultOptions;
+    nonDefaultOptions.setPaintOptionsAndroid(options);
+
+    SkPaint dummy;
+
+    REPORTER_ASSERT(reporter,
+                    Reconstruct(defaultOptions, &dummy) < Reconstruct(nonDefaultOptions, &dummy));
+}
+DEFINE_TESTCLASS_SHORT(android_options_size);
+
+#endif  // SK_BUILD_FOR_ANDROID