Changeset 219223 in webkit

Timestamp:

Jul 6, 2017 4:04:18 PM (7 years ago)

Author:

mmaxfield@apple.com

Message:

[Cocoa] Improve performance of font lookups
​https://bugs.webkit.org/show_bug.cgi?id=173960
<rdar://problem/31996891>

Reviewed by Darin Adler.

PerformanceTests:

• Layout/font-fallback-font-family.html: Added.
• Layout/resources/font-fallback-font-family.html: Added.

Source/WebCore:

Looking up kCTFontPostScriptNameAttribute is faster than kCTFontNameAttribute.

No new tests because there is no behavior change.

• platform/spi/cocoa/CoreTextSPI.h:
• platform/graphics/cocoa/FontCacheCoreText.cpp:

(WebCore::FontDatabase::fontForPostScriptName):

Location:

trunk

Files:

• PerformanceTests/ChangeLog (modified) (1 diff)
• PerformanceTests/Layout/font-fallback-font-family.html (added)
• PerformanceTests/Layout/resources/font-fallback-font-family.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp (modified) (1 diff)
• Source/WebCore/platform/spi/cocoa/CoreTextSPI.h (modified) (1 diff)

trunk/PerformanceTests/ChangeLog

@@ +1 @@
+2017-07-06  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        [Cocoa] Improve performance of font lookups
+        https://bugs.webkit.org/show_bug.cgi?id=173960
+        <rdar://problem/31996891>
+
+        Reviewed by Darin Adler.
+
+        * Layout/font-fallback-font-family.html: Added.
+        * Layout/resources/font-fallback-font-family.html: Added.
+
 2017-06-10  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-07-06  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        [Cocoa] Improve performance of font lookups
+        https://bugs.webkit.org/show_bug.cgi?id=173960
+        <rdar://problem/31996891>
+
+        Reviewed by Darin Adler.
+
+        Looking up kCTFontPostScriptNameAttribute is faster than kCTFontNameAttribute.
+
+        No new tests because there is no behavior change.
+
+        * platform/spi/cocoa/CoreTextSPI.h:
+        * platform/graphics/cocoa/FontCacheCoreText.cpp:
+        (WebCore::FontDatabase::fontForPostScriptName):
+
 2017-07-06  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp

@@ -911 +911 @@
         return m_postScriptNameToFontDescriptors.ensure(folded, [&] {
             auto postScriptNameString = folded.createCFString();
-            CFTypeRef keys[] = { kCTFontEnabledAttribute, kCTFontNameAttribute };
+#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300)
+            CFStringRef nameAttribute = kCTFontPostScriptNameAttribute;
+#else
+            CFStringRef nameAttribute = kCTFontNameAttribute;
+#endif
+            CFTypeRef keys[] = { kCTFontEnabledAttribute, nameAttribute };
             CFTypeRef values[] = { kCFBooleanTrue, postScriptNameString.get() };
             auto attributes = adoptCF(CFDictionaryCreate(kCFAllocatorDefault, keys, values, WTF_ARRAY_LENGTH(keys), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));

trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h

@@ -68 +68 @@
 extern const CFStringRef kCTFontReferenceURLAttribute;
 extern const CFStringRef kCTFontOpticalSizeAttribute;
+extern const CFStringRef kCTFontPostScriptNameAttribute;
 
 bool CTFontTransformGlyphs(CTFontRef, CGGlyph glyphs[], CGSize advances[], CFIndex count, CTFontTransformOptions);