Changeset 242204 in webkit

Timestamp:

Feb 28, 2019 10:22:34 AM (5 years ago)

Author:

mmaxfield@apple.com

Message:

Locale names can be nullptr
​https://bugs.webkit.org/show_bug.cgi?id=195171
<rdar://problem/48262376>

Reviewed by Dean Jackson.

Nullptr can't be used in keys to HashMaps, so take an early out in this case.

This is a partial revert of r241288.

• platform/graphics/cocoa/FontDescriptionCocoa.cpp:

(WebCore::FontDescription::platformResolveGenericFamily):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cocoa/FontDescriptionCocoa.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-02-28  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Locale names can be nullptr
+        https://bugs.webkit.org/show_bug.cgi?id=195171
+        <rdar://problem/48262376>
+
+        Reviewed by Dean Jackson.
+
+        Nullptr can't be used in keys to HashMaps, so take an early out in this case.
+
+        This is a partial revert of r241288.
+
+        * platform/graphics/cocoa/FontDescriptionCocoa.cpp:
+        (WebCore::FontDescription::platformResolveGenericFamily):
+
 2019-02-28  Justin Fan  <justin_fan@apple.com>
 

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

@@ -166 +166 @@
 AtomicString FontDescription::platformResolveGenericFamily(UScriptCode script, const AtomicString& locale, const AtomicString& familyName)
 {
-    if (script == USCRIPT_COMMON)
+    if (locale.isNull() || script == USCRIPT_COMMON)
         return nullAtom();