8b0e8ac5f5
Eliminates SkFlattenable{Read,Write}Buffer, promoting SkOrdered{Read,Write}Buffer
a step each in the hierarchy.
What used to be this:
SkFlattenableWriteBuffer -> SkOrderedWriteBuffer
SkFlattenableReadBuffer -> SkOrderedReadBuffer
SkFlattenableReadBuffer -> SkValidatingReadBuffer
is now
SkWriteBuffer
SkReadBuffer -> SkValidatingReadBuffer
Benefits:
- code is simpler, names are less wordy
- the generic SkFlattenableFooBuffer code in SkPaint was incorrect; removed
- write buffers are completely devirtualized, important for record speed
This refactoring was mostly mechanical. You aren't going to find anything
interesting in files with less than 10 lines changed.
BUG=skia:
R=reed@google.com, scroggo@google.com, djsollen@google.com, mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/134163010
git-svn-id: http://skia.googlecode.com/svn/trunk@13245 2bbb7eff-a529-9590-31e7-b0007b416f81
78 lines
2.4 KiB
C++
78 lines
2.4 KiB
C++
// 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);
|
|
options.setUseFontFallbacks(true);
|
|
|
|
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);
|
|
options.setUseFontFallbacks(true);
|
|
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.setUseFontFallbacks(true);
|
|
SkPaint nonDefaultOptions;
|
|
nonDefaultOptions.setPaintOptionsAndroid(options);
|
|
|
|
SkPaint dummy;
|
|
|
|
REPORTER_ASSERT(reporter,
|
|
Reconstruct(defaultOptions, &dummy) < Reconstruct(nonDefaultOptions, &dummy));
|
|
}
|
|
|
|
#endif // SK_BUILD_FOR_ANDROID
|