aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/SkPaint.cpp20
-rw-r--r--src/core/SkPaintOptionsAndroid.cpp65
-rw-r--r--src/core/SkScalerContext.cpp12
-rw-r--r--src/core/SkScalerContext.h11
-rw-r--r--src/ports/SkFontHost_android.cpp9
5 files changed, 8 insertions, 109 deletions
diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp
index 18cf651616..6c16428d81 100644
--- a/src/core/SkPaint.cpp
+++ b/src/core/SkPaint.cpp
@@ -180,19 +180,14 @@ uint32_t SkPaint::getGenerationID() const {
void SkPaint::setGenerationID(uint32_t generationID) {
fGenerationID = generationID;
}
+#endif
+#ifdef SK_BUILD_FOR_ANDROID
unsigned SkPaint::getBaseGlyphCount(SkUnichar text) const {
SkAutoGlyphCache autoCache(*this, NULL, NULL);
SkGlyphCache* cache = autoCache.getCache();
return cache->getBaseGlyphCount(text);
}
-
-void SkPaint::setPaintOptionsAndroid(const SkPaintOptionsAndroid& options) {
- if(!memcmp(&fPaintOptionsAndroid, &options, sizeof(SkPaintOptionsAndroid))) {
- fPaintOptionsAndroid = options;
- GEN_ID_INC;
- }
-}
#endif
void SkPaint::setHinting(Hinting hintingLevel) {
@@ -1811,13 +1806,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
- SkOrderedWriteBuffer androidBuffer(128);
- fPaintOptionsAndroid.flatten(androidBuffer);
- descSize += androidBuffer.size();
- entryCount += 1;
-#endif
-
///////////////////////////////////////////////////////////////////////////
// Now that we're done tweaking the rec, call the PostMakeRec cleanup
SkScalerContext::PostMakeRec(*this, &rec);
@@ -1830,10 +1818,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);
}
diff --git a/src/core/SkPaintOptionsAndroid.cpp b/src/core/SkPaintOptionsAndroid.cpp
deleted file mode 100644
index ef9375ece6..0000000000
--- a/src/core/SkPaintOptionsAndroid.cpp
+++ /dev/null
@@ -1,65 +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.
- */
-
-#ifdef SK_BUILD_FOR_ANDROID
-
-#include "SkPaintOptionsAndroid.h"
-#include "SkFlattenableBuffers.h"
-#include "SkTDict.h"
-#include "SkThread.h"
-#include <cstring>
-
-SkLanguage SkLanguage::getParent() const {
- SkASSERT(fInfo != NULL);
- const char* tag = fInfo->fTag.c_str();
- SkASSERT(tag != NULL);
-
- // strip off the rightmost "-.*"
- char* parentTagEnd = strrchr(tag, '-');
- if (parentTagEnd == NULL) {
- return SkLanguage("");
- }
- size_t parentTagLen = parentTagEnd - tag;
- char parentTag[parentTagLen + 1];
- strncpy(parentTag, tag, parentTagLen);
- parentTag[parentTagLen] = '\0';
- return SkLanguage(parentTag);
-}
-
-SK_DECLARE_STATIC_MUTEX(gGetInfoMutex);
-const SkLanguageInfo* SkLanguage::getInfo(const char* tag) {
- SkAutoMutexAcquire lock(gGetInfoMutex);
-
- static const size_t kDictSize = 128;
- static SkTDict<SkLanguageInfo*> tagToInfo(kDictSize);
-
- // try a lookup
- SkLanguageInfo* info;
- if (tagToInfo.find(tag, &info)) {
- return info;
- }
-
- // no match - add this language
- info = new SkLanguageInfo(tag);
- tagToInfo.set(tag, info);
- return info;
-}
-
-void SkPaintOptionsAndroid::flatten(SkFlattenableWriteBuffer& buffer) const {
- buffer.writeUInt(fFontVariant);
- buffer.writeString(fLanguage.getTag().c_str());
-}
-
-void SkPaintOptionsAndroid::unflatten(SkFlattenableReadBuffer& buffer) {
- fFontVariant = (FontVariant)buffer.readUInt();
- char* tag = buffer.readString();
- fLanguage = SkLanguage(tag);
- sk_free(tag);
-}
-
-#endif
diff --git a/src/core/SkScalerContext.cpp b/src/core/SkScalerContext.cpp
index 1f71bf0885..ba14908c2e 100644
--- a/src/core/SkScalerContext.cpp
+++ b/src/core/SkScalerContext.cpp
@@ -110,15 +110,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) {
- SkOrderedReadBuffer buffer(data, len);
- fPaintOptionsAndroid.unflatten(buffer);
- SkASSERT(buffer.offset() == buffer.size());
- }
-#endif
}
SkScalerContext::~SkScalerContext() {
@@ -134,8 +125,7 @@ SkScalerContext::~SkScalerContext() {
SkScalerContext* SkScalerContext::allocNextContext() const {
#ifdef SK_BUILD_FOR_ANDROID
SkTypeface* newFace = SkAndroidNextLogicalTypeface(fRec.fFontID,
- fRec.fOrigFontID,
- fPaintOptionsAndroid);
+ fRec.fOrigFontID);
if (0 == newFace) {
return NULL;
}
diff --git a/src/core/SkScalerContext.h b/src/core/SkScalerContext.h
index 06f5f94e17..d17b423496 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;
@@ -221,10 +217,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;
@@ -270,9 +262,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/SkFontHost_android.cpp b/src/ports/SkFontHost_android.cpp
index aeeec953d3..ce478def6b 100644
--- a/src/ports/SkFontHost_android.cpp
+++ b/src/ports/SkFontHost_android.cpp
@@ -801,15 +801,15 @@ SkTypeface* SkFontHost::CreateTypeface(const SkTypeface* familyFace,
return tf;
}
-SkTypeface* SkAndroidNextLogicalTypeface(SkFontID currFontID, SkFontID origFontID,
- const SkPaintOptionsAndroid& options) {
-#if !defined(SK_BUILD_FOR_ANDROID_FRAMEWORK)
+SkTypeface* SkAndroidNextLogicalTypeface(SkFontID currFontID,
+ SkFontID origFontID) {
+#if defined(SK_BUILD_FOR_ANDROID) && !defined(SK_BUILD_FOR_ANDROID_FRAMEWORK)
// Skia does not support font fallback for ndk applications in order to
// enable clients such as WebKit to customize their font selection.
// Clients can use GetFallbackFamilyNameForChar() to get the fallback
// font for individual characters.
return NULL;
-#endif
+#else
SkAutoMutexAcquire ac(gFamilyHeadAndNameListMutex);
load_system_fonts();
@@ -845,6 +845,7 @@ SkTypeface* SkAndroidNextLogicalTypeface(SkFontID currFontID, SkFontID origFontI
// i.e. gFallbackFonts[0] != 0.
const SkTypeface* firstTypeface = find_from_uniqueID(list[0]);
return SkRef(find_typeface(firstTypeface, origTypeface->style()));
+#endif
}
///////////////////////////////////////////////////////////////////////////////
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-21 07:12:24 +0000