Revert "Remove SkPaintOptionsAndroid"
This reverts commit 27fb94999b8eec448423884e1d071e563c4c95d9.
Review URL: https://codereview.chromium.org/450513002
diff --git a/tests/AndroidPaintTest.cpp b/tests/AndroidPaintTest.cpp
new file mode 100644
index 0000000..f5cf84f
--- /dev/null
+++ b/tests/AndroidPaintTest.cpp
@@ -0,0 +1,75 @@
+// SkPaints only have an SkPaintOptionsAndroid if SK_BUILD_FOR_ANDROID is true.
+#ifdef SK_BUILD_FOR_ANDROID
+
+#include "SkReadBuffer.h"
+#include "SkWriteBuffer.h"
+#include "SkPaint.h"
+#include "SkPaintOptionsAndroid.h"
+#include "Test.h"
+
+static size_t Reconstruct(const SkPaint& src, SkPaint* dst) {
+ SkWriteBuffer writer;
+ src.flatten(writer);
+
+ const size_t size = writer.bytesWritten();
+ SkAutoMalloc bytes(size);
+ writer.writeToMemory(bytes.get());
+
+ SkReadBuffer reader(bytes.get(), size);
+ dst->unflatten(reader);
+
+ return size;
+}
+
+DEF_TEST(AndroidOptionsSerialization, 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);
+
+ SkPaint paint;
+ paint.setPaintOptionsAndroid(options);
+
+ SkPaint reconstructed;
+ Reconstruct(paint, &reconstructed);
+
+ REPORTER_ASSERT(reporter, options == reconstructed.getPaintOptionsAndroid());
+}
+
+DEF_TEST(AndroidOptionsSerializationReverse, 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);
+ SkPaint nonDefaultOptions;
+ nonDefaultOptions.setPaintOptionsAndroid(options);
+
+ Reconstruct(defaultOptions, &nonDefaultOptions);
+
+ REPORTER_ASSERT(reporter,
+ defaultOptions.getPaintOptionsAndroid() ==
+ nonDefaultOptions.getPaintOptionsAndroid());
+}
+
+DEF_TEST(AndroidOptionsSize, 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.setLanguage("ja-JP");
+ SkPaint nonDefaultOptions;
+ nonDefaultOptions.setPaintOptionsAndroid(options);
+
+ SkPaint dummy;
+
+ REPORTER_ASSERT(reporter,
+ Reconstruct(defaultOptions, &dummy) < Reconstruct(nonDefaultOptions, &dummy));
+}
+
+#endif // SK_BUILD_FOR_ANDROID