Title: [193691] branches/safari-601.1.46-branch/Source/WebCore
- Revision
- 193691
- Author
- matthew_han...@apple.com
- Date
- 2015-12-07 21:37:57 -0800 (Mon, 07 Dec 2015)
Log Message
Build fix.
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (193690 => 193691)
--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-08 05:05:32 UTC (rev 193690)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-08 05:37:57 UTC (rev 193691)
@@ -1,3 +1,11 @@
+2015-12-07 Matthew Hanson <matthew_han...@apple.com>
+
+ Build fix.
+
+ * platform/graphics/ios/FontCacheIOS.mm:
+ (WebCore::FontCache::createFontPlatformData):
+ Pass two nullptrs to match function signature.
+
2015-12-07 David Kilzer <ddkil...@apple.com>
Merge r193635. rdar://problem/23785592
Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm (193690 => 193691)
--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm 2015-12-08 05:05:32 UTC (rev 193690)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm 2015-12-08 05:37:57 UTC (rev 193691)
@@ -86,7 +86,7 @@
if (!substituteFont)
return nullptr;
- substituteFont = applyFontFeatureSettings(substituteFont.get(), description.featureSettings(), description.variantSettings());
+ substituteFont = applyFontFeatureSettings(substituteFont.get(), nullptr, nullptr, description.featureSettings(), description.variantSettings());
CTFontSymbolicTraits originalTraits = CTFontGetSymbolicTraits(ctFont);
CTFontSymbolicTraits actualTraits = 0;
@@ -719,7 +719,7 @@
if (!ctFont)
return nullptr;
- ctFont = applyFontFeatureSettings(ctFont.get(), fontDescription.featureSettings(), fontDescription.variantSettings());
+ ctFont = applyFontFeatureSettings(ctFont.get(), nullptr, nullptr, fontDescription.featureSettings(), fontDescription.variantSettings());
CTFontSymbolicTraits actualTraits = 0;
if (isFontWeightBold(fontDescription.weight()) || fontDescription.italic())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
