Bug 1492220 - Fix encoding-form mismatch in macOS impl of GetVariationAxes. r=lsalzman

This commit is contained in:
Jonathan Kew 2018-09-19 09:25:58 +01:00
parent 5050b3952b
commit aa3e389fe2

View File

@ -334,9 +334,11 @@ MacOSFontEntry::GetVariationAxes(nsTArray<gfxFontVariationAxis>& aVariationAxes)
kCTFontVariationAxisNameKey);
if (name) {
CFIndex len = CFStringGetLength(name);
axis.mName.SetLength(len);
nsAutoString nameStr;
nameStr.SetLength(len);
CFStringGetCharacters(name, CFRangeMake(0, len),
(UniChar*)axis.mName.BeginWriting());
(UniChar*)nameStr.BeginWriting());
AppendUTF16toUTF8(nameStr, axis.mName);
}
axis.mTag = (uint32_t)tag;
axis.mMinValue = minValue;