Skip to content

Commit e2b305d

Browse files
author
David Hyatt
committed
Fix Mac bustage.
Canonical link: https://commits.webkit.org/12241@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@14514 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent c088fdc commit e2b305d

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

WebCore/platform/mac/FontCacheMac.mm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ FontPlatformData alternateFont(substituteFont,
170170
static AtomicString geezaStr("Geeza Pro");
171171
for (int j = 0; j < 3 && !platformData; ++j)
172172
if (currFamily->family().contains(matchWords[j], false))
173-
platformData = getCachedFontPlatformData(font, geezaStr);
173+
platformData = getCachedFontPlatformData(font.fontDescription(), geezaStr);
174174
}
175175
currFamily = currFamily->next();
176176
}
@@ -185,13 +185,13 @@ FontPlatformData alternateFont(substituteFont,
185185

186186
// FIXME: Would be even better to somehow get the user's default font here. For now we'll pick
187187
// the default that the user would get without changing any prefs.
188-
FontPlatformData* platformFont = getCachedFontPlatformData(font, timesStr);
188+
FontPlatformData* platformFont = getCachedFontPlatformData(font.fontDescription(), timesStr);
189189
if (!platformFont)
190190
// The Times fallback will almost always work, but in the highly unusual case where
191191
// the user doesn't have it, we fall back on Lucida Grande because that's
192192
// guaranteed to be there, according to Nathan Taylor. This is good enough
193193
// to avoid a crash at least.
194-
platformFont = getCachedFontPlatformData(font, lucidaGrandeStr);
194+
platformFont = getCachedFontPlatformData(font.fontDescription(), lucidaGrandeStr);
195195

196196
return platformFont;
197197
}

0 commit comments

Comments
 (0)