2016-01-05 13:08:56 +03:00
|
|
|
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
|
|
|
|
#include "SFNTNameTable.h"
|
|
|
|
|
Bug 1609996 - Reorder some includes affected by the previous patches. r=froydnj
This was done by:
This was done by applying:
```
diff --git a/python/mozbuild/mozbuild/code-analysis/mach_commands.py b/python/mozbuild/mozbuild/code-analysis/mach_commands.py
index 789affde7bbf..fe33c4c7d4d1 100644
--- a/python/mozbuild/mozbuild/code-analysis/mach_commands.py
+++ b/python/mozbuild/mozbuild/code-analysis/mach_commands.py
@@ -2007,7 +2007,7 @@ class StaticAnalysis(MachCommandBase):
from subprocess import Popen, PIPE, check_output, CalledProcessError
diff_process = Popen(self._get_clang_format_diff_command(commit), stdout=PIPE)
- args = [sys.executable, clang_format_diff, "-p1", "-binary=%s" % clang_format]
+ args = [sys.executable, clang_format_diff, "-p1", "-binary=%s" % clang_format, '-sort-includes']
if not output_file:
args.append("-i")
```
Then running `./mach clang-format -c <commit-hash>`
Then undoing that patch.
Then running check_spidermonkey_style.py --fixup
Then running `./mach clang-format`
I had to fix four things:
* I needed to move <utility> back down in GuardObjects.h because I was hitting
obscure problems with our system include wrappers like this:
0:03.94 /usr/include/stdlib.h:550:14: error: exception specification in declaration does not match previous declaration
0:03.94 extern void *realloc (void *__ptr, size_t __size)
0:03.94 ^
0:03.94 /home/emilio/src/moz/gecko-2/obj-debug/dist/include/malloc_decls.h:53:1: note: previous declaration is here
0:03.94 MALLOC_DECL(realloc, void*, void*, size_t)
0:03.94 ^
0:03.94 /home/emilio/src/moz/gecko-2/obj-debug/dist/include/mozilla/mozalloc.h:22:32: note: expanded from macro 'MALLOC_DECL'
0:03.94 MOZ_MEMORY_API return_type name##_impl(__VA_ARGS__);
0:03.94 ^
0:03.94 <scratch space>:178:1: note: expanded from here
0:03.94 realloc_impl
0:03.94 ^
0:03.94 /home/emilio/src/moz/gecko-2/obj-debug/dist/include/mozmemory_wrap.h:142:41: note: expanded from macro 'realloc_impl'
0:03.94 #define realloc_impl mozmem_malloc_impl(realloc)
Which I really didn't feel like digging into.
* I had to restore the order of TrustOverrideUtils.h and related files in nss
because the .inc files depend on TrustOverrideUtils.h being included earlier.
* I had to add a missing include to RollingNumber.h
* Also had to partially restore include order in JsepSessionImpl.cpp to avoid
some -WError issues due to some static inline functions being defined in a
header but not used in the rest of the compilation unit.
Differential Revision: https://phabricator.services.mozilla.com/D60327
--HG--
extra : moz-landing-system : lando
2020-01-20 19:19:48 +03:00
|
|
|
#include <utility>
|
|
|
|
|
2016-01-05 13:08:56 +03:00
|
|
|
#include "BigEndianInts.h"
|
|
|
|
#include "Logging.h"
|
|
|
|
|
2016-09-09 23:55:21 +03:00
|
|
|
#if defined(XP_MACOSX)
|
|
|
|
# include <CoreFoundation/CoreFoundation.h>
|
|
|
|
#endif
|
|
|
|
|
2016-01-05 13:08:56 +03:00
|
|
|
namespace mozilla {
|
|
|
|
namespace gfx {
|
|
|
|
|
|
|
|
static const BigEndianUint16 FORMAT_0 = 0;
|
|
|
|
|
|
|
|
static const BigEndianUint16 NAME_ID_FAMILY = 1;
|
|
|
|
static const BigEndianUint16 NAME_ID_STYLE = 2;
|
|
|
|
static const BigEndianUint16 NAME_ID_FULL = 4;
|
|
|
|
|
|
|
|
static const BigEndianUint16 PLATFORM_ID_UNICODE = 0;
|
|
|
|
static const BigEndianUint16 PLATFORM_ID_MAC = 1;
|
|
|
|
static const BigEndianUint16 PLATFORM_ID_MICROSOFT = 3;
|
|
|
|
|
|
|
|
static const BigEndianUint16 ENCODING_ID_MICROSOFT_SYMBOL = 0;
|
|
|
|
static const BigEndianUint16 ENCODING_ID_MICROSOFT_UNICODEBMP = 1;
|
|
|
|
static const BigEndianUint16 ENCODING_ID_MICROSOFT_UNICODEFULL = 10;
|
|
|
|
|
2016-09-09 23:55:21 +03:00
|
|
|
static const BigEndianUint16 ENCODING_ID_MAC_ROMAN = 0;
|
|
|
|
|
2016-01-05 13:08:56 +03:00
|
|
|
static const BigEndianUint16 LANG_ID_MAC_ENGLISH = 0;
|
|
|
|
|
|
|
|
static const BigEndianUint16 LANG_ID_MICROSOFT_EN_US = 0x0409;
|
|
|
|
|
|
|
|
#pragma pack(push, 1)
|
|
|
|
|
|
|
|
// Name table has a header, followed by name records, followed by string data.
|
|
|
|
struct NameHeader {
|
|
|
|
BigEndianUint16 format; // Format selector (=0).
|
|
|
|
BigEndianUint16 count; // Number of name records.
|
|
|
|
BigEndianUint16
|
|
|
|
stringOffset; // Offset to string storage from start of table.
|
|
|
|
};
|
|
|
|
|
|
|
|
struct NameRecord {
|
|
|
|
BigEndianUint16 platformID;
|
|
|
|
BigEndianUint16 encodingID; // Platform-specific encoding ID
|
|
|
|
BigEndianUint16 languageID;
|
|
|
|
BigEndianUint16 nameID;
|
|
|
|
BigEndianUint16 length; // String length in bytes.
|
|
|
|
BigEndianUint16 offset; // String offset from start of storage in bytes.
|
|
|
|
};
|
|
|
|
|
|
|
|
#pragma pack(pop)
|
|
|
|
|
2016-09-09 23:55:21 +03:00
|
|
|
enum ENameDecoder : int {
|
|
|
|
eNameDecoderUTF16,
|
|
|
|
#if defined(XP_MACOSX)
|
|
|
|
eNameDecoderMacRoman,
|
|
|
|
#endif
|
|
|
|
eNameDecoderNone
|
|
|
|
};
|
|
|
|
|
2016-01-05 13:08:56 +03:00
|
|
|
/* static */
|
|
|
|
UniquePtr<SFNTNameTable> SFNTNameTable::Create(const uint8_t* aNameData,
|
|
|
|
uint32_t aDataLength) {
|
|
|
|
MOZ_ASSERT(aNameData);
|
|
|
|
|
|
|
|
if (aDataLength < sizeof(NameHeader)) {
|
|
|
|
gfxWarning() << "Name data too short to contain NameHeader.";
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
const NameHeader* nameHeader = reinterpret_cast<const NameHeader*>(aNameData);
|
|
|
|
if (nameHeader->format != FORMAT_0) {
|
|
|
|
gfxWarning() << "Only Name Table Format 0 is supported.";
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
uint16_t stringOffset = nameHeader->stringOffset;
|
|
|
|
|
|
|
|
if (stringOffset !=
|
|
|
|
sizeof(NameHeader) + (nameHeader->count * sizeof(NameRecord))) {
|
|
|
|
gfxWarning() << "Name table string offset is incorrect.";
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (aDataLength < stringOffset) {
|
|
|
|
gfxWarning() << "Name data too short to contain name records.";
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
return UniquePtr<SFNTNameTable>(
|
|
|
|
new SFNTNameTable(nameHeader, aNameData, aDataLength));
|
|
|
|
}
|
|
|
|
|
|
|
|
SFNTNameTable::SFNTNameTable(const NameHeader* aNameHeader,
|
|
|
|
const uint8_t* aNameData, uint32_t aDataLength)
|
|
|
|
: mFirstRecord(
|
|
|
|
reinterpret_cast<const NameRecord*>(aNameData + sizeof(NameHeader))),
|
|
|
|
mEndOfRecords(mFirstRecord + aNameHeader->count),
|
|
|
|
mStringData(aNameData + aNameHeader->stringOffset),
|
|
|
|
mStringDataLength(aDataLength - aNameHeader->stringOffset) {
|
|
|
|
MOZ_ASSERT(reinterpret_cast<const uint8_t*>(aNameHeader) == aNameData);
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool IsUTF16Encoding(const NameRecord* aNameRecord) {
|
|
|
|
if (aNameRecord->platformID == PLATFORM_ID_MICROSOFT &&
|
|
|
|
(aNameRecord->encodingID == ENCODING_ID_MICROSOFT_UNICODEBMP ||
|
|
|
|
aNameRecord->encodingID == ENCODING_ID_MICROSOFT_SYMBOL)) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (aNameRecord->platformID == PLATFORM_ID_UNICODE) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2016-09-09 23:55:21 +03:00
|
|
|
#if defined(XP_MACOSX)
|
|
|
|
static bool IsMacRomanEncoding(const NameRecord* aNameRecord) {
|
|
|
|
if (aNameRecord->platformID == PLATFORM_ID_MAC &&
|
|
|
|
aNameRecord->encodingID == ENCODING_ID_MAC_ROMAN) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2016-01-05 13:08:56 +03:00
|
|
|
static NameRecordMatchers* CreateCanonicalMatchers(
|
2016-09-09 23:55:21 +03:00
|
|
|
const BigEndianUint16& aNameID) {
|
|
|
|
// For Windows, we return only Microsoft platform name record
|
|
|
|
// matchers. On Mac, we return matchers for both Microsoft platform
|
|
|
|
// records and Mac platform records.
|
2016-01-05 13:08:56 +03:00
|
|
|
NameRecordMatchers* matchers = new NameRecordMatchers();
|
|
|
|
|
2016-09-09 23:55:21 +03:00
|
|
|
#if defined(XP_MACOSX)
|
|
|
|
// First, look for the English name.
|
2016-01-05 13:08:56 +03:00
|
|
|
if (!matchers->append([=](const NameRecord* aNameRecord) {
|
2016-09-09 23:55:21 +03:00
|
|
|
if (aNameRecord->nameID == aNameID &&
|
|
|
|
aNameRecord->languageID == LANG_ID_MAC_ENGLISH &&
|
|
|
|
aNameRecord->platformID == PLATFORM_ID_MAC &&
|
|
|
|
IsMacRomanEncoding(aNameRecord)) {
|
|
|
|
return eNameDecoderMacRoman;
|
|
|
|
} else {
|
|
|
|
return eNameDecoderNone;
|
|
|
|
}
|
2016-01-14 17:19:16 +03:00
|
|
|
})) {
|
|
|
|
MOZ_CRASH();
|
|
|
|
}
|
2016-01-05 13:08:56 +03:00
|
|
|
|
|
|
|
// Second, look for all languages.
|
|
|
|
if (!matchers->append([=](const NameRecord* aNameRecord) {
|
2016-09-09 23:55:21 +03:00
|
|
|
if (aNameRecord->nameID == aNameID &&
|
|
|
|
aNameRecord->platformID == PLATFORM_ID_MAC &&
|
|
|
|
IsMacRomanEncoding(aNameRecord)) {
|
|
|
|
return eNameDecoderMacRoman;
|
|
|
|
} else {
|
|
|
|
return eNameDecoderNone;
|
|
|
|
}
|
2016-01-14 17:19:16 +03:00
|
|
|
})) {
|
|
|
|
MOZ_CRASH();
|
|
|
|
}
|
2016-09-09 23:55:21 +03:00
|
|
|
#endif /* defined(XP_MACOSX) */
|
2016-01-05 13:08:56 +03:00
|
|
|
|
2016-09-09 23:55:21 +03:00
|
|
|
// First, look for the English name (this will normally succeed).
|
2016-01-05 13:08:56 +03:00
|
|
|
if (!matchers->append([=](const NameRecord* aNameRecord) {
|
2016-09-09 23:55:21 +03:00
|
|
|
if (aNameRecord->nameID == aNameID &&
|
|
|
|
aNameRecord->languageID == LANG_ID_MICROSOFT_EN_US &&
|
|
|
|
aNameRecord->platformID == PLATFORM_ID_MICROSOFT &&
|
|
|
|
IsUTF16Encoding(aNameRecord)) {
|
|
|
|
return eNameDecoderUTF16;
|
|
|
|
} else {
|
|
|
|
return eNameDecoderNone;
|
|
|
|
}
|
2016-01-14 17:19:16 +03:00
|
|
|
})) {
|
|
|
|
MOZ_CRASH();
|
|
|
|
}
|
2016-09-09 23:55:21 +03:00
|
|
|
|
|
|
|
// Second, look for all languages.
|
2016-01-05 13:08:56 +03:00
|
|
|
if (!matchers->append([=](const NameRecord* aNameRecord) {
|
2016-09-09 23:55:21 +03:00
|
|
|
if (aNameRecord->nameID == aNameID &&
|
|
|
|
aNameRecord->platformID == PLATFORM_ID_MICROSOFT &&
|
|
|
|
IsUTF16Encoding(aNameRecord)) {
|
|
|
|
return eNameDecoderUTF16;
|
|
|
|
} else {
|
|
|
|
return eNameDecoderNone;
|
|
|
|
}
|
2016-01-14 17:19:16 +03:00
|
|
|
})) {
|
|
|
|
MOZ_CRASH();
|
|
|
|
}
|
2016-01-05 13:08:56 +03:00
|
|
|
|
|
|
|
return matchers;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const NameRecordMatchers& FullNameMatchers() {
|
|
|
|
static const NameRecordMatchers* sFullNameMatchers =
|
2016-09-09 23:55:21 +03:00
|
|
|
CreateCanonicalMatchers(NAME_ID_FULL);
|
2016-01-05 13:08:56 +03:00
|
|
|
return *sFullNameMatchers;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const NameRecordMatchers& FamilyMatchers() {
|
|
|
|
static const NameRecordMatchers* sFamilyMatchers =
|
2016-09-09 23:55:21 +03:00
|
|
|
CreateCanonicalMatchers(NAME_ID_FAMILY);
|
2016-01-05 13:08:56 +03:00
|
|
|
return *sFamilyMatchers;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const NameRecordMatchers& StyleMatchers() {
|
|
|
|
static const NameRecordMatchers* sStyleMatchers =
|
2016-09-09 23:55:21 +03:00
|
|
|
CreateCanonicalMatchers(NAME_ID_STYLE);
|
2016-01-05 13:08:56 +03:00
|
|
|
return *sStyleMatchers;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool SFNTNameTable::GetU16FullName(mozilla::u16string& aU16FullName) {
|
|
|
|
if (ReadU16Name(FullNameMatchers(), aU16FullName)) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
// If the full name record doesn't exist create the name from the family space
|
|
|
|
// concatenated with the style.
|
|
|
|
mozilla::u16string familyName;
|
|
|
|
if (!ReadU16Name(FamilyMatchers(), familyName)) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
mozilla::u16string styleName;
|
|
|
|
if (!ReadU16Name(StyleMatchers(), styleName)) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2018-05-30 22:15:35 +03:00
|
|
|
aU16FullName.assign(std::move(familyName));
|
2016-07-21 08:03:25 +03:00
|
|
|
aU16FullName.append(u" ");
|
2016-01-05 13:08:56 +03:00
|
|
|
aU16FullName.append(styleName);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool SFNTNameTable::ReadU16Name(const NameRecordMatchers& aMatchers,
|
|
|
|
mozilla::u16string& aU16Name) {
|
|
|
|
MOZ_ASSERT(!aMatchers.empty());
|
|
|
|
|
|
|
|
for (size_t i = 0; i < aMatchers.length(); ++i) {
|
|
|
|
const NameRecord* record = mFirstRecord;
|
|
|
|
while (record != mEndOfRecords) {
|
2016-09-09 23:55:21 +03:00
|
|
|
switch (aMatchers[i](record)) {
|
|
|
|
case eNameDecoderUTF16:
|
|
|
|
return ReadU16NameFromU16Record(record, aU16Name);
|
|
|
|
#if defined(XP_MACOSX)
|
|
|
|
case eNameDecoderMacRoman:
|
|
|
|
return ReadU16NameFromMacRomanRecord(record, aU16Name);
|
|
|
|
#endif
|
|
|
|
case eNameDecoderNone:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
MOZ_CRASH("Invalid matcher encoding type");
|
|
|
|
break;
|
2016-01-05 13:08:56 +03:00
|
|
|
}
|
|
|
|
++record;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2016-09-09 23:55:21 +03:00
|
|
|
bool SFNTNameTable::ReadU16NameFromU16Record(const NameRecord* aNameRecord,
|
|
|
|
mozilla::u16string& aU16Name) {
|
2016-01-05 13:08:56 +03:00
|
|
|
uint32_t offset = aNameRecord->offset;
|
|
|
|
uint32_t length = aNameRecord->length;
|
|
|
|
if (mStringDataLength < offset + length) {
|
|
|
|
gfxWarning() << "Name data too short to contain name string.";
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
const uint8_t* startOfName = mStringData + offset;
|
|
|
|
size_t actualLength = length / sizeof(char16_t);
|
|
|
|
UniquePtr<char16_t[]> nameData(new char16_t[actualLength]);
|
|
|
|
NativeEndian::copyAndSwapFromBigEndian(nameData.get(), startOfName,
|
|
|
|
actualLength);
|
|
|
|
|
|
|
|
aU16Name.assign(nameData.get(), actualLength);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2016-09-09 23:55:21 +03:00
|
|
|
#if defined(XP_MACOSX)
|
|
|
|
bool SFNTNameTable::ReadU16NameFromMacRomanRecord(
|
|
|
|
const NameRecord* aNameRecord, mozilla::u16string& aU16Name) {
|
|
|
|
uint32_t offset = aNameRecord->offset;
|
|
|
|
uint32_t length = aNameRecord->length;
|
|
|
|
if (mStringDataLength < offset + length) {
|
|
|
|
gfxWarning() << "Name data too short to contain name string.";
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
if (length > INT_MAX) {
|
|
|
|
gfxWarning() << "Name record too long to decode.";
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
// pointer to the Mac Roman encoded string in the name record
|
|
|
|
const uint8_t* encodedStr = mStringData + offset;
|
|
|
|
|
|
|
|
CFStringRef cfString;
|
|
|
|
cfString = CFStringCreateWithBytesNoCopy(kCFAllocatorDefault, encodedStr,
|
|
|
|
length, kCFStringEncodingMacRoman,
|
|
|
|
false, kCFAllocatorNull);
|
|
|
|
|
|
|
|
// length (in UTF-16 code pairs) of the decoded string
|
|
|
|
CFIndex decodedLength = CFStringGetLength(cfString);
|
|
|
|
|
|
|
|
// temporary buffer
|
|
|
|
UniquePtr<UniChar[]> u16Buffer = MakeUnique<UniChar[]>(decodedLength);
|
|
|
|
|
|
|
|
CFStringGetCharacters(cfString, CFRangeMake(0, decodedLength),
|
|
|
|
u16Buffer.get());
|
|
|
|
|
|
|
|
CFRelease(cfString);
|
|
|
|
|
|
|
|
aU16Name.assign(reinterpret_cast<char16_t*>(u16Buffer.get()), decodedLength);
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2016-01-05 13:08:56 +03:00
|
|
|
} // namespace gfx
|
|
|
|
} // namespace mozilla
|