Changeset 187807 in webkit

Timestamp:

Aug 3, 2015 9:40:13 PM (9 years ago)

Author:

mmaxfield@apple.com

Message:

Fix crashing Mavericks test

Unreviewed.

• platform/graphics/cocoa/FontPlatformDataCocoa.mm:

(WebCore::FontPlatformData::registeredFont):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cocoa/FontPlatformDataCocoa.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-08-03  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Fix crashing Mavericks test
+
+        Unreviewed.
+
+        * platform/graphics/cocoa/FontPlatformDataCocoa.mm:
+        (WebCore::FontPlatformData::registeredFont):
+
 2015-08-03  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm

@@ -95 +95 @@
 {
     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;