Title: [215331] trunk/Source/WebCore
Revision
215331
Author
mmaxfi...@apple.com
Date
2017-04-13 12:34:21 -0700 (Thu, 13 Apr 2017)

Log Message

Addressing post-review comment after r215314.
https://bugs.webkit.org/show_bug.cgi?id=169015

Reviewed by Alexey Proskuryakov.

* platform/graphics/cocoa/FontCacheCoreText.cpp:
(WebCore::FontDatabase::fontForPostScriptName):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (215330 => 215331)


--- trunk/Source/WebCore/ChangeLog	2017-04-13 19:19:49 UTC (rev 215330)
+++ trunk/Source/WebCore/ChangeLog	2017-04-13 19:34:21 UTC (rev 215331)
@@ -1,3 +1,13 @@
+2017-04-13  Myles C. Maxfield  <mmaxfi...@apple.com>
+
+        Addressing post-review comment after r215314.
+        https://bugs.webkit.org/show_bug.cgi?id=169015
+
+        Reviewed by Alexey Proskuryakov.
+
+        * platform/graphics/cocoa/FontCacheCoreText.cpp:
+        (WebCore::FontDatabase::fontForPostScriptName):
+
 2017-04-13  Sam Weinig  <s...@webkit.org>
 
         [WebIDL] Add support for extended attributes on types in WebIDL

Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp (215330 => 215331)


--- trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp	2017-04-13 19:19:49 UTC (rev 215330)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp	2017-04-13 19:34:21 UTC (rev 215331)
@@ -895,10 +895,8 @@
         auto folded = postScriptName.string().foldCase();
         return m_postScriptNameToFontDescriptors.ensure(folded, [&] {
             auto postScriptNameString = folded.createCFString();
-            const int _one_ = 1;
-            static NeverDestroyed<RetainPtr<CFNumberRef>> yes = adoptCF(CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &one));
             CFTypeRef keys[] = { kCTFontEnabledAttribute, kCTFontNameAttribute };
-            CFTypeRef values[] = { yes.get().get(), postScriptNameString.get() };
+            CFTypeRef values[] = { kCFBooleanTrue, postScriptNameString.get() };
             auto attributes = adoptCF(CFDictionaryCreate(kCFAllocatorDefault, keys, values, WTF_ARRAY_LENGTH(keys), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
             auto fontDescriptorToMatch = adoptCF(CTFontDescriptorCreateWithAttributes(attributes.get()));
             auto match = adoptCF(static_cast<CTFontDescriptorRef>(CTFontDescriptorCreateMatchingFontDescriptor(fontDescriptorToMatch.get(), nullptr)));
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to