diff options
author | Derek Sollenberger <djsollen@google.com> | 2014-08-06 16:34:40 -0400 |
---|---|---|
committer | Derek Sollenberger <djsollen@google.com> | 2014-08-06 16:34:40 -0400 |
commit | da7a944e293d27ec5c7be06b224921ae0058d35a (patch) | |
tree | 70a6553ab4cc08b0a862e7f68f4510c3d73c06c7 /src/core/SkScalerContext.cpp | |
parent | c7f069b50184cf786b46e20e3ba8431d8c82472a (diff) |
Revert "Remove SkPaintOptionsAndroid"
This reverts commit 27fb94999b8eec448423884e1d071e563c4c95d9.
Review URL: https://codereview.chromium.org/450513002
Diffstat (limited to 'src/core/SkScalerContext.cpp')
-rw-r--r-- | src/core/SkScalerContext.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/core/SkScalerContext.cpp b/src/core/SkScalerContext.cpp index db3c0fb2f5..11208fec59 100644 --- a/src/core/SkScalerContext.cpp +++ b/src/core/SkScalerContext.cpp @@ -23,6 +23,10 @@ #include "SkStroke.h" #include "SkThread.h" +#ifdef SK_BUILD_FOR_ANDROID + #include "SkTypeface_android.h" +#endif + #define ComputeBWRowBytes(width) (((unsigned)(width) + 7) >> 3) void SkGlyph::toMask(SkMask* mask) const { @@ -107,6 +111,15 @@ SkScalerContext::SkScalerContext(SkTypeface* typeface, const SkDescriptor* desc) desc->findEntry(kPathEffect_SkDescriptorTag, NULL), desc->findEntry(kMaskFilter_SkDescriptorTag, NULL)); #endif +#ifdef SK_BUILD_FOR_ANDROID + uint32_t len; + const void* data = desc->findEntry(kAndroidOpts_SkDescriptorTag, &len); + if (data) { + SkReadBuffer buffer(data, len); + fPaintOptionsAndroid.unflatten(buffer); + SkASSERT(buffer.offset() == buffer.size()); + } +#endif } SkScalerContext::~SkScalerContext() { |