Title: [193599] branches/safari-601-branch/Source/WebCore
- Revision
- 193599
- Author
- ddkil...@apple.com
- Date
- 2015-12-06 15:00:20 -0800 (Sun, 06 Dec 2015)
Log Message
REGRESSION (r193575): variantSettings is unused when PLATFORM_FONT_LOOKUP is disabled
<rdar://problem/23769741>
* platform/graphics/mac/FontCacheMac.mm:
(WebCore::fontWithFamily): Mark variantSettings as ununsed when
PLATFORM_FONT_LOOKUP is disabled.
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193598 => 193599)
--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-06 22:43:01 UTC (rev 193598)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-06 23:00:20 UTC (rev 193599)
@@ -1,3 +1,12 @@
+2015-12-06 David Kilzer <ddkil...@apple.com>
+
+ REGRESSION (r193575): variantSettings is unused when PLATFORM_FONT_LOOKUP is disabled
+ <rdar://problem/23769741>
+
+ * platform/graphics/mac/FontCacheMac.mm:
+ (WebCore::fontWithFamily): Mark variantSettings as ununsed when
+ PLATFORM_FONT_LOOKUP is disabled.
+
2015-12-06 Babak Shafiei <bshaf...@apple.com>
Merge r188114.
Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm (193598 => 193599)
--- branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2015-12-06 22:43:01 UTC (rev 193598)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2015-12-06 23:00:20 UTC (rev 193599)
@@ -297,6 +297,7 @@
#else
UNUSED_PARAM(featureSettings);
+ UNUSED_PARAM(variantSettings);
NSFontTraitMask desiredTraitsForNameMatch = desiredTraits | (weight >= FontWeight600 ? NSBoldFontMask : 0);
if (hasDesiredFamilyToAvailableFamilyMapping(family, desiredTraitsForNameMatch, availableFamily)) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
