Macintosh-SW/tenfourfox
1
0
Fork 0
mirror of https://github.com/classilla/tenfourfox.git synced 2025-01-19 07:31:25 +00:00
Code Issues Projects Releases Wiki Activity

and Little Endian paths to GetFont Table and FindTagInTableDir

Browse Source
This commit is contained in:
Riccardo Mottola 2018-02-05 21:15:52 +01:00
parent 7ba58cf7fa
commit dc3e34a505
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
gfx/thebes/gfxMacPlatformFontList.mm
View File

@ -481,14 +481,14 @@ MacOSFontEntry::GetFontTable(uint32_t aTag)
ByteCount dataLength = 0; ByteCount dataLength = 0;
if (!mIsDataUserFont || mIsLocalUserFont) TryGlobalFontTableCache(); if (!mIsDataUserFont || mIsLocalUserFont) TryGlobalFontTableCache();
// See if we already know how long the table is. This saves a potentially // See if we already know how long the table is. This saves a potentially
// expensive call to ATSGetFontTable() to simply get the length. // expensive call to ATSGetFontTable() to simply get the length.
// Essentially a hardcoded form of FindTagInTableDir; see below. // Essentially a hardcoded form of FindTagInTableDir; see below.
if (MOZ_LIKELY(mFontTableDirSize > 0)) { if (MOZ_LIKELY(mFontTableDirSize > 0)) {
// XXX: This assumes big endian (warning Intel) uint32_t aTagHE = aTag;
#ifndef __ppc__ #ifndef __ppc__
#warning needs GetFontTable fast path needs little endian version aTagHE = __builtin_bswap32(aTag);
#endif #endif
#ifdef DEBUG_X #ifdef DEBUG_X
@ -500,19 +500,23 @@ MacOSFontEntry::GetFontTable(uint32_t aTag)
uint32_t i; uint32_t i;
uint32_t *wtable = (reinterpret_cast<uint32_t *>( uint32_t *wtable = (reinterpret_cast<uint32_t *>(
mFontTableDir.Elements())); mFontTableDir.Elements()));
for (i=3; i<(mFontTableDirSize/4); i+=4) { // Skip header for (i=3; i<(mFontTableDirSize/4); i+=4) { // Skip header
#ifdef DEBUG_X #ifdef DEBUG_X
char tag[5] = { table[j], table[j+1], table[j+2], table[j+3], char tag[5] = { table[j], table[j+1], table[j+2], table[j+3],
'\0' }; '\0' };
fprintf(stderr, "%s ", tag); // remember: big endian fprintf(stderr, "%s ", tag); // remember: host endian
j += 16; j += 16;
#endif #endif
// ASSUME THAT aTag is already big endian // ASSUME THAT aTag is in host endianness
if(wtable[i] == aTag) { if(wtable[i] == aTagHE) {
#ifdef DEBUG_X
fprintf(stderr, "MATCH: length %i\n", wtable[i+3]);
#endif
dataLength = (ByteCount)wtable[i+3]; dataLength = (ByteCount)wtable[i+3];
#ifndef __ppc__
dataLength = __builtin_bswap32(dataLength);
#endif
#ifdef DEBUG_X
fprintf(stderr, "FF MATCH: length %u\n", dataLength);
#endif
break; break;
} }
} }
@ -532,7 +536,7 @@ MacOSFontEntry::GetFontTable(uint32_t aTag)
CFMutableDataRef dataRef = ::CFDataCreateMutable(kCFAllocatorDefault, CFMutableDataRef dataRef = ::CFDataCreateMutable(kCFAllocatorDefault,
dataLength); dataLength);
if (!dataRef) return nullptr; if (!dataRef) return nullptr;
::CFDataIncreaseLength(dataRef, dataLength); // paranoia ::CFDataIncreaseLength(dataRef, dataLength); // paranoia
if(MOZ_UNLIKELY(::ATSFontGetTable(fontRef, aTag, 0, dataLength, if(MOZ_UNLIKELY(::ATSFontGetTable(fontRef, aTag, 0, dataLength,
::CFDataGetMutableBytePtr(dataRef), ::CFDataGetMutableBytePtr(dataRef),
@ -540,7 +544,7 @@ MacOSFontEntry::GetFontTable(uint32_t aTag)
::CFRelease(dataRef); ::CFRelease(dataRef);
return nullptr; return nullptr;
} }
return hb_blob_create((const char*)::CFDataGetBytePtr(dataRef), return hb_blob_create((const char*)::CFDataGetBytePtr(dataRef),
::CFDataGetLength(dataRef), ::CFDataGetLength(dataRef),
HB_MEMORY_MODE_READONLY, HB_MEMORY_MODE_READONLY,
@ -559,6 +563,11 @@ static bool FindTagInTableDir(FallibleTArray<uint8_t>& table,
// corresponding to the tag, checksum, offset and length, with a // corresponding to the tag, checksum, offset and length, with a
// 96 bit header (three 32-bit words). One day we could even write // 96 bit header (three 32-bit words). One day we could even write
// an AltiVec version ... // an AltiVec version ...
// aTableTag is expected to be Big Endian order
#ifndef __ppc__
aTableTag = __builtin_bswap32(aTableTag);
#endif
#ifdef DEBUG_X #ifdef DEBUG_X
fprintf(stderr, "Tables: "); fprintf(stderr, "Tables: ");
uint32_t j = 12; uint32_t j = 12;
@ -571,7 +580,7 @@ static bool FindTagInTableDir(FallibleTArray<uint8_t>& table,
fprintf(stderr, "%s ", tag); // remember: big endian fprintf(stderr, "%s ", tag); // remember: big endian
j+=16; j+=16;
#endif #endif
// ASSUME THAT aTableTag is already big endian // ASSUME THAT aTableTag is already big endian (we converted it in case)
if(wtable[i] == aTableTag) { if(wtable[i] == aTableTag) {
#ifdef DEBUG_X #ifdef DEBUG_X
fprintf(stderr, "MATCH\n"); fprintf(stderr, "MATCH\n");