Title: [187807] trunk/Source/WebCore
- Revision
- 187807
- Author
- mmaxfi...@apple.com
- Date
- 2015-08-03 21:40:13 -0700 (Mon, 03 Aug 2015)
Log Message
Fix crashing Mavericks test
Unreviewed.
* platform/graphics/cocoa/FontPlatformDataCocoa.mm:
(WebCore::FontPlatformData::registeredFont):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (187806 => 187807)
--- trunk/Source/WebCore/ChangeLog 2015-08-04 03:42:00 UTC (rev 187806)
+++ trunk/Source/WebCore/ChangeLog 2015-08-04 04:40:13 UTC (rev 187807)
@@ -1,5 +1,14 @@
2015-08-03 Myles C. Maxfield <mmaxfi...@apple.com>
+ Fix crashing Mavericks test
+
+ Unreviewed.
+
+ * platform/graphics/cocoa/FontPlatformDataCocoa.mm:
+ (WebCore::FontPlatformData::registeredFont):
+
+2015-08-03 Myles C. Maxfield <mmaxfi...@apple.com>
+
Unreviewed post-review feedback on r187797
The correct terminology is "registered" instead of "activated."
Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm (187806 => 187807)
--- trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2015-08-04 03:42:00 UTC (rev 187806)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2015-08-04 04:40:13 UTC (rev 187807)
@@ -94,8 +94,8 @@
CTFontRef FontPlatformData::registeredFont() const
{
CTFontRef platformFont = font();
- ASSERT(platformFont);
- if (adoptCF(CTFontCopyAttribute(platformFont, kCTFontURLAttribute)))
+ ASSERT(!CORETEXT_WEB_FONTS || platformFont);
+ if (platformFont && adoptCF(CTFontCopyAttribute(platformFont, kCTFontURLAttribute)))
return platformFont;
return nullptr;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
