diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/SkPaint.cpp | 69 | ||||
| -rw-r--r-- | src/core/SkPaintOptionsAndroid.cpp | 43 | ||||
| -rw-r--r-- | src/core/SkScalerContext.cpp | 13 | ||||
| -rw-r--r-- | src/core/SkScalerContext.h | 11 | ||||
| -rw-r--r-- | src/ports/SkFontConfigParser_android.cpp | 48 | ||||
| -rw-r--r-- | src/ports/SkFontConfigParser_android.h | 56 | ||||
| -rw-r--r-- | src/ports/SkFontMgr_android.cpp | 15 |
7 files changed, 95 insertions, 160 deletions
diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp index 9e53d19e2a..3dd87b7aa6 100644 --- a/src/core/SkPaint.cpp +++ b/src/core/SkPaint.cpp @@ -21,7 +21,6 @@ #include "SkReadBuffer.h" #include "SkWriteBuffer.h" #include "SkPaintDefaults.h" -#include "SkPaintOptionsAndroid.h" #include "SkPathEffect.h" #include "SkRasterizer.h" #include "SkScalar.h" @@ -55,7 +54,6 @@ enum { kImageFilter_DirtyBit = 1 << 13, kTypeface_DirtyBit = 1 << 14, kAnnotation_DirtyBit = 1 << 15, - kPaintOptionsAndroid_DirtyBit = 1 << 16, }; // define this to get a printf for out-of-range parameter in setters @@ -101,7 +99,6 @@ SkPaint::SkPaint() { fDirtyBits = 0; #ifdef SK_BUILD_FOR_ANDROID - new (&fPaintOptionsAndroid) SkPaintOptionsAndroid; fGenerationID = 0; #endif } @@ -131,7 +128,6 @@ SkPaint::SkPaint(const SkPaint& src) { COPY(fDirtyBits); #ifdef SK_BUILD_FOR_ANDROID - new (&fPaintOptionsAndroid) SkPaintOptionsAndroid(src.fPaintOptionsAndroid); COPY(fGenerationID); #endif @@ -183,8 +179,6 @@ SkPaint& SkPaint::operator=(const SkPaint& src) { COPY(fDirtyBits); #ifdef SK_BUILD_FOR_ANDROID - fPaintOptionsAndroid.~SkPaintOptionsAndroid(); - new (&fPaintOptionsAndroid) SkPaintOptionsAndroid(src.fPaintOptionsAndroid); ++fGenerationID; #endif @@ -214,9 +208,6 @@ bool operator==(const SkPaint& a, const SkPaint& b) { && EQUAL(fWidth) && EQUAL(fMiterLimit) && EQUAL(fBitfieldsUInt) -#ifdef SK_BUILD_FOR_ANDROID - && EQUAL(fPaintOptionsAndroid) -#endif ; #undef EQUAL } @@ -241,14 +232,6 @@ uint32_t SkPaint::getGenerationID() const { void SkPaint::setGenerationID(uint32_t generationID) { fGenerationID = generationID; } - -void SkPaint::setPaintOptionsAndroid(const SkPaintOptionsAndroid& options) { - if (options != fPaintOptionsAndroid) { - fPaintOptionsAndroid = options; - GEN_ID_INC; - fDirtyBits |= kPaintOptionsAndroid_DirtyBit; - } -} #endif void SkPaint::setFilterLevel(FilterLevel level) { @@ -1843,14 +1826,6 @@ void SkPaint::descriptorProc(const SkDeviceProperties* deviceProperties, rec.fMaskFormat = SkMask::kA8_Format; // force antialiasing when we do the scan conversion } -#ifdef SK_BUILD_FOR_ANDROID - char buffer[128]; - SkWriteBuffer androidBuffer(buffer, sizeof(buffer)); - fPaintOptionsAndroid.flatten(androidBuffer); - descSize += androidBuffer.bytesWritten(); - entryCount += 1; -#endif - /////////////////////////////////////////////////////////////////////////// // Now that we're done tweaking the rec, call the PostMakeRec cleanup SkScalerContext::PostMakeRec(*this, &rec); @@ -1863,10 +1838,6 @@ void SkPaint::descriptorProc(const SkDeviceProperties* deviceProperties, desc->init(); desc->addEntry(kRec_SkDescriptorTag, sizeof(rec), &rec); -#ifdef SK_BUILD_FOR_ANDROID - add_flattenable(desc, kAndroidOpts_SkDescriptorTag, &androidBuffer); -#endif - if (pe) { add_flattenable(desc, kPathEffect_SkDescriptorTag, &peBuffer); } @@ -1901,11 +1872,6 @@ void SkPaint::descriptorProc(const SkDeviceProperties* deviceProperties, desc1->addEntry(kRec_SkDescriptorTag, sizeof(rec), &rec); desc2->addEntry(kRec_SkDescriptorTag, sizeof(rec), &rec); -#ifdef SK_BUILD_FOR_ANDROID - add_flattenable(desc1, kAndroidOpts_SkDescriptorTag, &androidBuffer); - add_flattenable(desc2, kAndroidOpts_SkDescriptorTag, &androidBuffer); -#endif - if (pe) { add_flattenable(desc1, kPathEffect_SkDescriptorTag, &peBuffer); add_flattenable(desc2, kPathEffect_SkDescriptorTag, &peBuffer); @@ -2122,11 +2088,6 @@ void SkPaint::flatten(SkWriteBuffer& buffer) const { asint(this->getImageFilter())) { flatFlags |= kHasEffects_FlatFlag; } -#ifdef SK_BUILD_FOR_ANDROID - if (this->getPaintOptionsAndroid() != SkPaintOptionsAndroid()) { - flatFlags |= kHasNonDefaultPaintOptionsAndroid_FlatFlag; - } -#endif SkASSERT(SkAlign4(kPODPaintSize) == kPODPaintSize); uint32_t* ptr = buffer.reserve(kPODPaintSize); @@ -2165,11 +2126,6 @@ void SkPaint::flatten(SkWriteBuffer& buffer) const { buffer.writeBool(false); } } -#ifdef SK_BUILD_FOR_ANDROID - if (flatFlags & kHasNonDefaultPaintOptionsAndroid_FlatFlag) { - this->getPaintOptionsAndroid().flatten(buffer); - } -#endif } void SkPaint::unflatten(SkReadBuffer& buffer) { @@ -2228,15 +2184,12 @@ void SkPaint::unflatten(SkReadBuffer& buffer) { 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 + if (buffer.isVersionLT(SkReadBuffer::kRemoveAndroidPaintOpts_Version) && + flatFlags & kHasNonDefaultPaintOptionsAndroid_FlatFlag) { + SkString tag; + buffer.readUInt(); + buffer.readString(&tag); + buffer.readBool(); } } @@ -2695,9 +2648,6 @@ void SkPaint::FlatteningTraits::Flatten(SkWriteBuffer& buffer, const SkPaint& pa #undef F if (dirty & kTypeface_DirtyBit) buffer.writeTypeface(paint.getTypeface()); if (dirty & kAnnotation_DirtyBit) paint.getAnnotation()->writeToBuffer(buffer); -#ifdef SK_BUILD_FOR_ANDROID - if (dirty & kPaintOptionsAndroid_DirtyBit) paint.getPaintOptionsAndroid().flatten(buffer); -#endif } void SkPaint::FlatteningTraits::Unflatten(SkReadBuffer& buffer, SkPaint* paint) { @@ -2732,12 +2682,5 @@ void SkPaint::FlatteningTraits::Unflatten(SkReadBuffer& buffer, SkPaint* paint) if (dirty & kAnnotation_DirtyBit) { paint->setAnnotation(SkAnnotation::Create(buffer))->unref(); } -#ifdef SK_BUILD_FOR_ANDROID - if (dirty & kPaintOptionsAndroid_DirtyBit) { - SkPaintOptionsAndroid options; - options.unflatten(buffer); - paint->setPaintOptionsAndroid(options); - } -#endif SkASSERT(dirty == paint->fDirtyBits); } diff --git a/src/core/SkPaintOptionsAndroid.cpp b/src/core/SkPaintOptionsAndroid.cpp deleted file mode 100644 index df71ca87a4..0000000000 --- a/src/core/SkPaintOptionsAndroid.cpp +++ /dev/null @@ -1,43 +0,0 @@ - -/* - * Copyright 2012 The Android Open Source Project - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#include "SkPaintOptionsAndroid.h" -#include "SkReadBuffer.h" -#include "SkWriteBuffer.h" -#include "SkTDict.h" -#include "SkThread.h" -#include <cstring> - -SkLanguage SkLanguage::getParent() const { - SkASSERT(!fTag.isEmpty()); - const char* tag = fTag.c_str(); - - // strip off the rightmost "-.*" - const char* parentTagEnd = strrchr(tag, '-'); - if (parentTagEnd == NULL) { - return SkLanguage(); - } - size_t parentTagLen = parentTagEnd - tag; - return SkLanguage(tag, parentTagLen); -} - -void SkPaintOptionsAndroid::flatten(SkWriteBuffer& buffer) const { - buffer.writeUInt(fFontVariant); - buffer.writeString(fLanguage.getTag().c_str()); - // to maintain picture compatibility for the old fUseFontFallbacks variable - buffer.writeBool(false); -} - -void SkPaintOptionsAndroid::unflatten(SkReadBuffer& buffer) { - fFontVariant = (FontVariant)buffer.readUInt(); - SkString tag; - buffer.readString(&tag); - fLanguage = SkLanguage(tag); - // to maintain picture compatibility for the old fUseFontFallbacks variable - buffer.readBool(); -} diff --git a/src/core/SkScalerContext.cpp b/src/core/SkScalerContext.cpp index 11208fec59..db3c0fb2f5 100644 --- a/src/core/SkScalerContext.cpp +++ b/src/core/SkScalerContext.cpp @@ -23,10 +23,6 @@ #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 { @@ -111,15 +107,6 @@ 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() { diff --git a/src/core/SkScalerContext.h b/src/core/SkScalerContext.h index 43b5ebfaf6..609e9dd673 100644 --- a/src/core/SkScalerContext.h +++ b/src/core/SkScalerContext.h @@ -14,10 +14,6 @@ #include "SkPaint.h" #include "SkTypeface.h" -#ifdef SK_BUILD_FOR_ANDROID - #include "SkPaintOptionsAndroid.h" -#endif - struct SkGlyph; class SkDescriptor; class SkMaskFilter; @@ -262,10 +258,6 @@ private: // never null SkAutoTUnref<SkTypeface> fTypeface; -#ifdef SK_BUILD_FOR_ANDROID - SkPaintOptionsAndroid fPaintOptionsAndroid; -#endif - // optional object, which may be null SkPathEffect* fPathEffect; SkMaskFilter* fMaskFilter; @@ -297,9 +289,6 @@ private: #define kPathEffect_SkDescriptorTag SkSetFourByteTag('p', 't', 'h', 'e') #define kMaskFilter_SkDescriptorTag SkSetFourByteTag('m', 's', 'k', 'f') #define kRasterizer_SkDescriptorTag SkSetFourByteTag('r', 'a', 's', 't') -#ifdef SK_BUILD_FOR_ANDROID -#define kAndroidOpts_SkDescriptorTag SkSetFourByteTag('a', 'n', 'd', 'r') -#endif /////////////////////////////////////////////////////////////////////////////// diff --git a/src/ports/SkFontConfigParser_android.cpp b/src/ports/SkFontConfigParser_android.cpp index 658055d5a2..b38ec8cc4c 100644 --- a/src/ports/SkFontConfigParser_android.cpp +++ b/src/ports/SkFontConfigParser_android.cpp @@ -109,9 +109,9 @@ void familyElementHandler(FontFamily* family, const char** attributes) { } else if (nameLen == 7 && !strncmp("variant", name, nameLen)) { // Value should be either elegant or compact. if (valueLen == 7 && !strncmp("elegant", value, valueLen)) { - family->fVariant = SkPaintOptionsAndroid::kElegant_Variant; + family->fVariant = kElegant_FontVariant; } else if (valueLen == 7 && !strncmp("compact", value, valueLen)) { - family->fVariant = SkPaintOptionsAndroid::kCompact_Variant; + family->fVariant = kCompact_FontVariant; } } } @@ -122,13 +122,6 @@ void fontFileNameHandler(void* data, const char* s, int len) { familyData->currentFontInfo->fFileName.set(s, len); } -void familyElementEndHandler(FontFamily* family) { - for (int i = 0; i < family->fFonts.count(); i++) { - family->fFonts[i].fPaintOptions.setLanguage(family->fLanguage); - family->fFonts[i].fPaintOptions.setFontVariant(family->fVariant); - } -} - void fontElementHandler(XML_Parser* parser, FontFileInfo* file, const char** attributes) { // A <font> should have weight (integer) and style (normal, italic) attributes. // NOTE: we ignore the style. @@ -278,7 +271,6 @@ void endElementHandler(void* data, const char* tag) { if (len == 9 && strncmp(tag, "familyset", len) == 0) { familysetElementEndHandler(familyData); } else if (len == 6 && strncmp(tag, "family", len) == 0) { - familyElementEndHandler(familyData->currentFamily); *familyData->families.append() = familyData->currentFamily; familyData->currentFamily = NULL; } else if (len == 4 && !strncmp(tag, "font", len)) { @@ -332,14 +324,27 @@ static void fontFileElementHandler(FamilyData* familyData, const char** attribut size_t nameLength = strlen(attributeName); size_t valueLength = strlen(attributeValue); if (nameLength == 7 && strncmp(attributeName, "variant", nameLength) == 0) { + const FontVariant prevVariant = familyData->currentFamily->fVariant; if (valueLength == 7 && strncmp(attributeValue, "elegant", valueLength) == 0) { - newFileInfo.fPaintOptions.setFontVariant(SkPaintOptionsAndroid::kElegant_Variant); + familyData->currentFamily->fVariant = kElegant_FontVariant; } else if (valueLength == 7 && strncmp(attributeValue, "compact", valueLength) == 0) { - newFileInfo.fPaintOptions.setFontVariant(SkPaintOptionsAndroid::kCompact_Variant); + familyData->currentFamily->fVariant = kCompact_FontVariant; + } + if (familyData->currentFamily->fFonts.count() > 1 && + familyData->currentFamily->fVariant != prevVariant) { + SkDebugf("Every font file within a family must have identical variants"); + sk_throw(); } + } else if (nameLength == 4 && strncmp(attributeName, "lang", nameLength) == 0) { - newFileInfo.fPaintOptions.setLanguage(attributeValue); + SkLanguage prevLang = familyData->currentFamily->fLanguage; + familyData->currentFamily->fLanguage = SkLanguage(attributeValue); + if (familyData->currentFamily->fFonts.count() > 1 && + familyData->currentFamily->fLanguage != prevLang) { + SkDebugf("Every font file within a family must have identical languages"); + sk_throw(); + } } else if (nameLength == 5 && strncmp(attributeName, "index", nameLength) == 0) { int value; if (parseNonNegativeInteger(attributeValue, &value)) { @@ -514,9 +519,7 @@ static void getFallbackFontFamiliesForLocale(SkTDArray<FontFamily*> &fallbackFon for (int i = 0; i < langSpecificFonts.count(); ++i) { FontFamily* family = langSpecificFonts[i]; - for (int j = 0; j < family->fFonts.count(); ++j) { - family->fFonts[j].fPaintOptions.setLanguage(locale); - } + family->fLanguage = SkLanguage(locale); *fallbackFonts.append() = family; } } @@ -594,3 +597,16 @@ void SkFontConfigParser::GetTestFontFamilies(SkTDArray<FontFamily*> &fontFamilie *fontFamilies.append() = fallbackFonts[i]; } } + +SkLanguage SkLanguage::getParent() const { + SkASSERT(!fTag.isEmpty()); + const char* tag = fTag.c_str(); + + // strip off the rightmost "-.*" + const char* parentTagEnd = strrchr(tag, '-'); + if (parentTagEnd == NULL) { + return SkLanguage(); + } + size_t parentTagLen = parentTagEnd - tag; + return SkLanguage(tag, parentTagLen); +} diff --git a/src/ports/SkFontConfigParser_android.h b/src/ports/SkFontConfigParser_android.h index 40b645287a..117a1086fb 100644 --- a/src/ports/SkFontConfigParser_android.h +++ b/src/ports/SkFontConfigParser_android.h @@ -8,18 +8,62 @@ #ifndef SKFONTCONFIGPARSER_ANDROID_H_ #define SKFONTCONFIGPARSER_ANDROID_H_ -#include "SkTypes.h" - -#include "SkPaintOptionsAndroid.h" #include "SkString.h" #include "SkTDArray.h" +/** \class SkLanguage + + The SkLanguage class represents a human written language, and is used by + text draw operations to determine which glyph to draw when drawing + characters with variants (ie Han-derived characters). +*/ +class SkLanguage { +public: + SkLanguage() { } + SkLanguage(const SkString& tag) : fTag(tag) { } + SkLanguage(const char* tag) : fTag(tag) { } + SkLanguage(const char* tag, size_t len) : fTag(tag, len) { } + SkLanguage(const SkLanguage& b) : fTag(b.fTag) { } + + /** Gets a BCP 47 language identifier for this SkLanguage. + @return a BCP 47 language identifier representing this language + */ + const SkString& getTag() const { return fTag; } + + /** Performs BCP 47 fallback to return an SkLanguage one step more general. + @return an SkLanguage one step more general + */ + SkLanguage getParent() const; + + bool operator==(const SkLanguage& b) const { + return fTag == b.fTag; + } + bool operator!=(const SkLanguage& b) const { + return fTag != b.fTag; + } + SkLanguage& operator=(const SkLanguage& b) { + fTag = b.fTag; + return *this; + } + +private: + //! BCP 47 language identifier + SkString fTag; +}; + +enum FontVariants { + kDefault_FontVariant = 0x01, + kCompact_FontVariant = 0x02, + kElegant_FontVariant = 0x04, + kLast_FontVariant = kElegant_FontVariant, +}; +typedef uint32_t FontVariant; + struct FontFileInfo { FontFileInfo() : fIndex(0), fWeight(0) { } SkString fFileName; int fIndex; - SkPaintOptionsAndroid fPaintOptions; int fWeight; }; @@ -32,14 +76,14 @@ struct FontFileInfo { */ struct FontFamily { FontFamily() - : fVariant(SkPaintOptionsAndroid::kDefault_Variant) + : fVariant(kDefault_FontVariant) , fOrder(-1) , fIsFallbackFont(false) { } SkTArray<SkString> fNames; SkTArray<FontFileInfo> fFonts; SkLanguage fLanguage; - SkPaintOptionsAndroid::FontVariant fVariant; + FontVariant fVariant; int fOrder; // internal to SkFontConfigParser bool fIsFallbackFont; }; diff --git a/src/ports/SkFontMgr_android.cpp b/src/ports/SkFontMgr_android.cpp index b03185de63..e966c84f1f 100644 --- a/src/ports/SkFontMgr_android.cpp +++ b/src/ports/SkFontMgr_android.cpp @@ -67,7 +67,7 @@ public: bool isFixedPitch, const SkString familyName, const SkLanguage& lang, - uint32_t variantStyle) + FontVariant variantStyle) : INHERITED(index, style, isFixedPitch, familyName) , fPathName(pathName) , fLang(lang) @@ -88,7 +88,7 @@ public: const SkString fPathName; const SkLanguage fLang; - const uint32_t fVariantStyle; + const FontVariant fVariantStyle; typedef SkTypeface_Android INHERITED; }; @@ -163,11 +163,10 @@ public: continue; } - const SkLanguage& lang = fontFile.fPaintOptions.getLanguage(); - uint32_t variant = fontFile.fPaintOptions.getFontVariant(); - if (SkPaintOptionsAndroid::kDefault_Variant == variant) { - variant = SkPaintOptionsAndroid::kCompact_Variant | - SkPaintOptionsAndroid::kElegant_Variant; + const SkLanguage& lang = family.fLanguage; + uint32_t variant = family.fVariant; + if (kDefault_FontVariant == variant) { + variant = kCompact_FontVariant | kElegant_FontVariant; } // The first specified family name overrides the family name found in the font. @@ -353,7 +352,7 @@ protected: // TODO: add 'is_elegant' and 'is_compact' bits to 'style' request. // For compatibility, try 'elegant' fonts first in fallback. - uint32_t variantMask = SkPaintOptionsAndroid::kElegant_Variant; + uint32_t variantMask = kElegant_FontVariant; // The first time match anything in the mask, second time anything not in the mask. for (bool maskMatches = true; maskMatches != false; maskMatches = false) { |