Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(137)

Unified Diff: tests/AndroidPaintTest.cpp

Issue 447873003: Remove SkPaintOptionsAndroid (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: typo Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« src/ports/SkFontConfigParser_android.h ('K') | « src/ports/SkFontMgr_android.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/AndroidPaintTest.cpp
diff --git a/tests/AndroidPaintTest.cpp b/tests/AndroidPaintTest.cpp
deleted file mode 100644
index f5cf84f4f38c3534bdfb99d9858da7f1bb8eaebd..0000000000000000000000000000000000000000
--- a/tests/AndroidPaintTest.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-// 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
« src/ports/SkFontConfigParser_android.h ('K') | « src/ports/SkFontMgr_android.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698