mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

bug 811312 - part 1 - remove the ATSFontEntry class (not needed on 10.6 and later). r=jdaggett

This commit is contained in:
Jonathan Kew 2012-11-19 10:01:43 +00:00
Родитель e9068634ad
Коммит 9c1f586890
5 изменённых файлов: 32 добавлений и 421 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

22
gfx/thebes/gfxCoreTextShaper.cpp
Просмотреть файл

@ -38,18 +38,10 @@ gfxCoreTextShaper::gfxCoreTextShaper(gfxMacFont *aFont)
: gfxFontShaper(aFont)
{
// Create our CTFontRef
if (gfxMacPlatformFontList::UseATSFontEntry()) {
ATSFontEntry *fe = static_cast<ATSFontEntry*>(aFont->GetFontEntry());
mCTFont = ::CTFontCreateWithPlatformFont(fe->GetATSFontRef(),
aFont->GetAdjustedSize(),
NULL,
GetDefaultFeaturesDescriptor());
} else {
mCTFont = ::CTFontCreateWithGraphicsFont(aFont->GetCGFontRef(),
aFont->GetAdjustedSize(),
NULL,
GetDefaultFeaturesDescriptor());
}
mCTFont = ::CTFontCreateWithGraphicsFont(aFont->GetCGFontRef(),
aFont->GetAdjustedSize(),
NULL,
GetDefaultFeaturesDescriptor());
// Set up the default attribute dictionary that we will need each time we create a CFAttributedString
mAttributesDict = ::CFDictionaryCreate(kCFAllocatorDefault,
@ -637,12 +629,6 @@ gfxCoreTextShaper::CreateCTFontWithDisabledLigatures(CGFloat aSize)
::CFRelease(attributesDict);
}
if (gfxMacPlatformFontList::UseATSFontEntry()) {
ATSFontEntry *fe = static_cast<ATSFontEntry*>(mFont->GetFontEntry());
return ::CTFontCreateWithPlatformFont(fe->GetATSFontRef(), aSize, NULL,
sDisableLigaturesDescriptor);
}
gfxMacFont *f = static_cast<gfxMacFont*>(mFont);
return ::CTFontCreateWithGraphicsFont(f->GetCGFontRef(), aSize, NULL,
sDisableLigaturesDescriptor);

41
gfx/thebes/gfxMacFont.cpp
Просмотреть файл

@ -384,12 +384,6 @@ gfxMacFont::GetFontTable(uint32_t aTag)
void
gfxMacFont::InitMetricsFromPlatform()
{
if (gfxMacPlatformFontList::UseATSFontEntry()) {
ATSFontEntry *fe = static_cast<ATSFontEntry*>(GetFontEntry());
InitMetricsFromATSMetrics(fe->GetATSFontRef());
return;
}
CTFontRef ctFont = ::CTFontCreateWithGraphicsFont(mCGFont,
mAdjustedSize,
NULL, NULL);
@ -426,41 +420,6 @@ gfxMacFont::InitMetricsFromPlatform()
mIsValid = true;
}
// For OS X 10.5, try to initialize font metrics via ATS font metrics APIs,
// and set mIsValid = TRUE on success.
void
gfxMacFont::InitMetricsFromATSMetrics(ATSFontRef aFontRef)
{
ATSFontMetrics atsMetrics;
OSStatus err;
err = ::ATSFontGetHorizontalMetrics(aFontRef, kATSOptionFlagsDefault,
&atsMetrics);
if (err != noErr) {
#ifdef DEBUG
char warnBuf[1024];
sprintf(warnBuf, "Bad font metrics for: %s err: %8.8x",
NS_ConvertUTF16toUTF8(mFontEntry->Name()).get(), uint32_t(err));
NS_WARNING(warnBuf);
#endif
return;
}
mMetrics.underlineOffset = atsMetrics.underlinePosition * mAdjustedSize;
mMetrics.underlineSize = atsMetrics.underlineThickness * mAdjustedSize;
mMetrics.externalLeading = atsMetrics.leading * mAdjustedSize;
mMetrics.maxAscent = atsMetrics.ascent * mAdjustedSize;
mMetrics.maxDescent = -atsMetrics.descent * mAdjustedSize;
mMetrics.maxAdvance = atsMetrics.maxAdvanceWidth * mAdjustedSize;
mMetrics.aveCharWidth = atsMetrics.avgAdvanceWidth * mAdjustedSize;
mMetrics.xHeight = atsMetrics.xHeight * mAdjustedSize;
mIsValid = true;
}
TemporaryRef<ScaledFont>
gfxMacFont::GetScaledFont(DrawTarget *aTarget)
{

1
gfx/thebes/gfxMacFont.h
Просмотреть файл

@ -64,7 +64,6 @@ protected:
void InitMetrics();
void InitMetricsFromPlatform();
void InitMetricsFromATSMetrics(ATSFontRef aFontRef);
// Get width and glyph ID for a character; uses aConvFactor
// to convert font units as returned by CG to actual dimensions

37
gfx/thebes/gfxMacPlatformFontList.h
Просмотреть файл

@ -57,35 +57,7 @@ protected:
bool mIsCFFInitialized;
};
// concrete subclasses of MacOSFontEntry: ATSFontEntry for 10.5, CGFontEntry for 10.6+
class ATSFontEntry : public MacOSFontEntry
{
public:
ATSFontEntry(const nsAString& aPostscriptName, int32_t aWeight,
gfxFontFamily *aFamily, bool aIsStandardFace = false);
// for use with data fonts
ATSFontEntry(const nsAString& aPostscriptName, ATSFontRef aFontRef,
uint16_t aWeight, uint16_t aStretch, uint32_t aItalicStyle,
gfxUserFontData *aUserFontData, bool aIsLocal);
ATSFontRef GetATSFontRef();
virtual CGFontRef GetFontRef();
virtual nsresult GetFontTable(uint32_t aTableTag,
FallibleTArray<uint8_t>& aBuffer);
virtual void SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf,
FontListSizes* aSizes) const;
protected:
virtual bool HasFontTable(uint32_t aTableTag);
ATSFontRef mATSFontRef;
bool mATSFontRefInitialized;
};
// concrete subclass of MacOSFontEntry: CGFontEntry for 10.6+
class CGFontEntry : public MacOSFontEntry
{
public:
@ -129,10 +101,6 @@ public:
void ClearPrefFonts() { mPrefFonts.Clear(); }
static bool UseATSFontEntry() {
return gfxPlatformMac::GetPlatform()->OSXVersion() < MAC_OS_X_VERSION_10_6_HEX;
}
private:
friend class gfxPlatformMac;
@ -148,9 +116,6 @@ private:
gfxFontEntry* MakePlatformFontCG(const gfxProxyFontEntry *aProxyEntry,
const uint8_t *aFontData, uint32_t aLength);
gfxFontEntry* MakePlatformFontATS(const gfxProxyFontEntry *aProxyEntry,
const uint8_t *aFontData, uint32_t aLength);
static void ATSNotification(ATSFontNotificationInfoRef aInfo, void* aUserArg);
// search fonts system-wide for a given character, null otherwise

352
gfx/thebes/gfxMacPlatformFontList.mm
Просмотреть файл

@ -145,7 +145,7 @@ static NSString* GetNSStringForString(const nsAString& aSrc)
#endif // PR_LOGGING
/* MacOSFontEntry - abstract superclass for ATS and CG font entries */
/* MacOSFontEntry - abstract superclass for CG font entries */
#pragma mark-
MacOSFontEntry::MacOSFontEntry(const nsAString& aPostscriptName,
@ -356,113 +356,6 @@ MacOSFontEntry::IsCFF()
return mIsCFF;
}
/* ATSFontEntry - used on Mac OS X 10.5.x */
#pragma mark-
ATSFontEntry::ATSFontEntry(const nsAString& aPostscriptName,
int32_t aWeight,
gfxFontFamily *aFamily,
bool aIsStandardFace)
: MacOSFontEntry(aPostscriptName, aWeight, aFamily, aIsStandardFace),
mATSFontRef(kInvalidFont),
mATSFontRefInitialized(false)
{
}
ATSFontEntry::ATSFontEntry(const nsAString& aPostscriptName,
ATSFontRef aFontRef,
uint16_t aWeight, uint16_t aStretch,
uint32_t aItalicStyle,
gfxUserFontData *aUserFontData,
bool aIsLocal)
: MacOSFontEntry(aPostscriptName, aWeight, nullptr, false)
{
mATSFontRef = aFontRef;
mATSFontRefInitialized = true;
mWeight = aWeight;
mStretch = aStretch;
mFixedPitch = false; // xxx - do we need this for downloaded fonts?
mItalic = (aItalicStyle & (NS_FONT_STYLE_ITALIC | NS_FONT_STYLE_OBLIQUE)) != 0;
mUserFontData = aUserFontData;
mIsUserFont = (aUserFontData != nullptr) || aIsLocal;
mIsLocalUserFont = aIsLocal;
}
ATSFontRef
ATSFontEntry::GetATSFontRef()
{
if (!mATSFontRefInitialized) {
mATSFontRefInitialized = true;
NSString *psname = GetNSStringForString(mName);
mATSFontRef = ::ATSFontFindFromPostScriptName(CFStringRef(psname),
kATSOptionFlagsDefault);
}
return mATSFontRef;
}
CGFontRef
ATSFontEntry::GetFontRef()
{
if (mFontRefInitialized) {
return mFontRef;
}
// GetATSFontRef will initialize mATSFontRef
if (GetATSFontRef() == kInvalidFont) {
return nullptr;
}
mFontRef = ::CGFontCreateWithPlatformFont(&mATSFontRef);
mFontRefInitialized = true;
return mFontRef;
}
nsresult
ATSFontEntry::GetFontTable(uint32_t aTableTag, FallibleTArray<uint8_t>& aBuffer)
{
nsAutoreleasePool localPool;
ATSFontRef fontRef = GetATSFontRef();
if (fontRef == kInvalidFont) {
return NS_ERROR_FAILURE;
}
ByteCount dataLength;
OSStatus status = ::ATSFontGetTable(fontRef, aTableTag, 0, 0, 0, &dataLength);
if (status != noErr) {
return NS_ERROR_FAILURE;
}
if (!aBuffer.SetLength(dataLength)) {
return NS_ERROR_OUT_OF_MEMORY;
}
uint8_t *dataPtr = aBuffer.Elements();
status = ::ATSFontGetTable(fontRef, aTableTag, 0, dataLength, dataPtr, &dataLength);
NS_ENSURE_TRUE(status == noErr, NS_ERROR_FAILURE);
return NS_OK;
}
bool
ATSFontEntry::HasFontTable(uint32_t aTableTag)
{
ATSFontRef fontRef = GetATSFontRef();
ByteCount size;
return fontRef != kInvalidFont &&
(::ATSFontGetTable(fontRef, aTableTag, 0, 0, 0, &size) == noErr);
}
void
ATSFontEntry::SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf,
FontListSizes* aSizes) const
{
aSizes->mFontListSize += aMallocSizeOf(this);
SizeOfExcludingThis(aMallocSizeOf, aSizes);
}
/* CGFontEntry - used on Mac OS X 10.6+ */
#pragma mark-
@ -653,14 +546,9 @@ gfxMacFontFamily::FindStyleVariations()
}
// create a font entry
MacOSFontEntry *fontEntry;
if (gfxMacPlatformFontList::UseATSFontEntry()) {
fontEntry = new ATSFontEntry(postscriptFontName,
cssWeight, this, isStandardFace);
} else {
fontEntry = new CGFontEntry(postscriptFontName,
cssWeight, this, isStandardFace);
}
MacOSFontEntry *fontEntry =
new CGFontEntry(postscriptFontName, cssWeight, this,
isStandardFace);
if (!fontEntry) {
break;
}
@ -1074,61 +962,30 @@ gfxMacPlatformFontList::LookupLocalFont(const gfxProxyFontEntry *aProxyEntry,
NSString *faceName = GetNSStringForString(aFontName);
MacOSFontEntry *newFontEntry;
if (UseATSFontEntry()) {
// first lookup a single face based on postscript name
ATSFontRef fontRef = ::ATSFontFindFromPostScriptName(CFStringRef(faceName),
kATSOptionFlagsDefault);
// if not found, lookup using full font name
if (fontRef == kInvalidFont) {
fontRef = ::ATSFontFindFromName(CFStringRef(faceName),
kATSOptionFlagsDefault);
if (fontRef == kInvalidFont) {
return nullptr;
}
}
if (aProxyEntry) {
uint16_t w = aProxyEntry->mWeight;
NS_ASSERTION(w >= 100 && w <= 900, "bogus font weight value!");
newFontEntry =
new ATSFontEntry(aFontName, fontRef,
w, aProxyEntry->mStretch,
aProxyEntry->mItalic ?
NS_FONT_STYLE_ITALIC : NS_FONT_STYLE_NORMAL,
nullptr, true);
} else {
newFontEntry =
new ATSFontEntry(aFontName, fontRef,
400, 0, NS_FONT_STYLE_NORMAL, nullptr, false);
}
} else {
// lookup face based on postscript or full name
CGFontRef fontRef = ::CGFontCreateWithFontName(CFStringRef(faceName));
if (!fontRef) {
return nullptr;
}
if (aProxyEntry) {
uint16_t w = aProxyEntry->mWeight;
NS_ASSERTION(w >= 100 && w <= 900, "bogus font weight value!");
newFontEntry =
new CGFontEntry(aFontName, fontRef,
w, aProxyEntry->mStretch,
aProxyEntry->mItalic ?
NS_FONT_STYLE_ITALIC : NS_FONT_STYLE_NORMAL,
true, true);
} else {
newFontEntry =
new CGFontEntry(aFontName, fontRef,
400, 0, NS_FONT_STYLE_NORMAL,
false, false);
}
::CFRelease(fontRef);
// lookup face based on postscript or full name
CGFontRef fontRef = ::CGFontCreateWithFontName(CFStringRef(faceName));
if (!fontRef) {
return nullptr;
}
if (aProxyEntry) {
uint16_t w = aProxyEntry->mWeight;
NS_ASSERTION(w >= 100 && w <= 900, "bogus font weight value!");
newFontEntry =
new CGFontEntry(aFontName, fontRef,
w, aProxyEntry->mStretch,
aProxyEntry->mItalic ?
NS_FONT_STYLE_ITALIC : NS_FONT_STYLE_NORMAL,
true, true);
} else {
newFontEntry =
new CGFontEntry(aFontName, fontRef,
400, 0, NS_FONT_STYLE_NORMAL,
false, false);
}
::CFRelease(fontRef);
return newFontEntry;
}
@ -1137,9 +994,7 @@ gfxMacPlatformFontList::MakePlatformFont(const gfxProxyFontEntry *aProxyEntry,
const uint8_t *aFontData,
uint32_t aLength)
{
return UseATSFontEntry()
? MakePlatformFontATS(aProxyEntry, aFontData, aLength)
: MakePlatformFontCG(aProxyEntry, aFontData, aLength);
return MakePlatformFontCG(aProxyEntry, aFontData, aLength);
}
static void ReleaseData(void *info, const void *data, size_t size)
@ -1198,156 +1053,3 @@ gfxMacPlatformFontList::MakePlatformFontCG(const gfxProxyFontEntry *aProxyEntry,
return nullptr;
}
// grumble, another non-publised Apple API dependency (found in Webkit code)
// activated with this value, font will not be found via system lookup routines
// it can only be used via the created ATSFontRef
// needed to prevent one doc from finding a font used in a separate doc
enum {
kPrivateATSFontContextPrivate = 3
};
class ATSUserFontData : public gfxUserFontData {
public:
ATSUserFontData(ATSFontContainerRef aContainerRef)
: mContainerRef(aContainerRef)
{ }
virtual ~ATSUserFontData()
{
// deactivate font
if (mContainerRef) {
::ATSFontDeactivate(mContainerRef, NULL, kATSOptionFlagsDefault);
}
}
ATSFontContainerRef mContainerRef;
};
gfxFontEntry*
gfxMacPlatformFontList::MakePlatformFontATS(const gfxProxyFontEntry *aProxyEntry,
const uint8_t *aFontData,
uint32_t aLength)
{
OSStatus err;
NS_ASSERTION(aFontData, "MakePlatformFont called with null data");
// MakePlatformFont is responsible for deleting the font data with NS_Free
// so we set up a stack object to ensure it is freed even if we take an
// early exit
struct FontDataDeleter {
FontDataDeleter(const uint8_t *aFontData)
: mFontData(aFontData) { }
~FontDataDeleter() { NS_Free((void*)mFontData); }
const uint8_t *mFontData;
};
FontDataDeleter autoDelete(aFontData);
ATSFontRef fontRef;
ATSFontContainerRef containerRef;
// we get occasional failures when multiple fonts are activated in quick succession
// if the ATS font cache is damaged; to work around this, we can retry the activation
const uint32_t kMaxRetries = 3;
uint32_t retryCount = 0;
while (retryCount++ < kMaxRetries) {
err = ::ATSFontActivateFromMemory(const_cast<uint8_t*>(aFontData), aLength,
kPrivateATSFontContextPrivate,
kATSFontFormatUnspecified,
NULL,
kATSOptionFlagsDoNotNotify,
&containerRef);
mATSGeneration = ::ATSGetGeneration();
if (err != noErr) {
#if DEBUG
char warnBuf[1024];
sprintf(warnBuf, "downloaded font error, ATSFontActivateFromMemory err: %d for (%s)",
int32_t(err),
NS_ConvertUTF16toUTF8(aProxyEntry->mFamily->Name()).get());
NS_WARNING(warnBuf);
#endif
return nullptr;
}
// ignoring containers with multiple fonts, use the first face only for now
err = ::ATSFontFindFromContainer(containerRef, kATSOptionFlagsDefault, 1,
&fontRef, NULL);
if (err != noErr) {
#if DEBUG
char warnBuf[1024];
sprintf(warnBuf, "downloaded font error, ATSFontFindFromContainer err: %d for (%s)",
int32_t(err),
NS_ConvertUTF16toUTF8(aProxyEntry->mFamily->Name()).get());
NS_WARNING(warnBuf);
#endif
::ATSFontDeactivate(containerRef, NULL, kATSOptionFlagsDefault);
return nullptr;
}
// now lookup the Postscript name; this may fail if the font cache is bad
OSStatus err;
NSString *psname = NULL;
err = ::ATSFontGetPostScriptName(fontRef, kATSOptionFlagsDefault, (CFStringRef*) (&psname));
if (err == noErr) {
[psname release];
} else {
#ifdef DEBUG
char warnBuf[1024];
sprintf(warnBuf, "ATSFontGetPostScriptName err = %d for (%s), retries = %d", (int32_t)err,
NS_ConvertUTF16toUTF8(aProxyEntry->mFamily->Name()).get(), retryCount);
NS_WARNING(warnBuf);
#endif
::ATSFontDeactivate(containerRef, NULL, kATSOptionFlagsDefault);
// retry the activation a couple of times if this fails
// (may be a transient failure due to ATS font cache issues)
continue;
}
uint16_t w = aProxyEntry->mWeight;
NS_ASSERTION(w >= 100 && w <= 900, "bogus font weight value!");
nsAutoString uniqueName;
nsresult rv = gfxFontUtils::MakeUniqueUserFontName(uniqueName);
if (NS_FAILED(rv)) {
return nullptr;
}
// font entry will own this
ATSUserFontData *userFontData = new ATSUserFontData(containerRef);
ATSFontEntry *newFontEntry =
new ATSFontEntry(uniqueName,
fontRef,
w, aProxyEntry->mStretch,
aProxyEntry->mItalic ?
NS_FONT_STYLE_ITALIC : NS_FONT_STYLE_NORMAL,
userFontData, false);
// if succeeded and font cmap is good, return the new font
if (newFontEntry->mIsValid && NS_SUCCEEDED(newFontEntry->ReadCMAP())) {
return newFontEntry;
}
// if something is funky about this font, delete immediately
#if DEBUG
char warnBuf[1024];
sprintf(warnBuf, "downloaded font not loaded properly, removed face for (%s)",
NS_ConvertUTF16toUTF8(aProxyEntry->mFamily->Name()).get());
NS_WARNING(warnBuf);
#endif
delete newFontEntry;
// We don't retry from here; the ATS font cache issue would have caused failure earlier
// so if we get here, there's something else bad going on within our font data structures.
// Currently, there should be no way to reach here, as fontentry creation cannot fail
// except by memory allocation failure.
NS_WARNING("invalid font entry for a newly activated font");
break;
}
// if we get here, the activation failed (even with possible retries); can't use this font
return nullptr;
}