Title: [193541] branches/safari-601.1.46-branch/Source/WebCore
- Revision
- 193541
- Author
- [email protected]
- Date
- 2015-12-05 17:54:27 -0800 (Sat, 05 Dec 2015)
Log Message
Merge r187709. rdar://problem/23769683
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (193540 => 193541)
--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-06 01:54:25 UTC (rev 193540)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-06 01:54:27 UTC (rev 193541)
@@ -1,5 +1,18 @@
2015-12-05 Matthew Hanson <[email protected]>
+ Merge r187709. rdar://problem/23769683
+
+ 2015-07-31 Myles C. Maxfield <[email protected]>
+
+ Fix the build
+
+ Unreviewed.
+
+ * platform/graphics/mac/FontCacheMac.mm:
+ (WebCore::lookupCTFont):
+
+2015-12-05 Matthew Hanson <[email protected]>
+
Merge r188168. rdar://problem/23769683
2015-08-07 Myles C. Maxfield <[email protected]>
Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm (193540 => 193541)
--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2015-12-06 01:54:25 UTC (rev 193540)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2015-12-06 01:54:27 UTC (rev 193541)
@@ -485,7 +485,9 @@
static inline RetainPtr<CTFontRef> lookupCTFont(CTFontRef font, float fontSize, const UChar* characters, unsigned length)
{
-#if __MAC_OS_X_VERSION_MIN_REQUIRED == 1090
+#if __MAC_OS_X_VERSION_MIN_REQUIRED != 1090
+ UNUSED_PARAM(fontSize);
+#else
if (!font) {
font = reinterpret_cast<CTFontRef>([NSFont userFontOfSize:fontSize]);
bool acceptable = true;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
