Title: [242223] branches/safari-607.1.40.0-branch/Source/WebCore
- Revision
- 242223
- Author
- [email protected]
- Date
- 2019-02-28 13:41:14 -0800 (Thu, 28 Feb 2019)
Log Message
Cherry-pick r242204. rdar://problem/48483749
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):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@242204 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-607.1.40.0-branch/Source/WebCore/ChangeLog (242222 => 242223)
--- branches/safari-607.1.40.0-branch/Source/WebCore/ChangeLog 2019-02-28 21:39:52 UTC (rev 242222)
+++ branches/safari-607.1.40.0-branch/Source/WebCore/ChangeLog 2019-02-28 21:41:14 UTC (rev 242223)
@@ -1,3 +1,37 @@
+2019-02-28 Alan Coon <[email protected]>
+
+ Cherry-pick r242204. rdar://problem/48483749
+
+ 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):
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@242204 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-02-28 Myles C. Maxfield <[email protected]>
+
+ 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-27 Alan Coon <[email protected]>
Cherry-pick r242138. rdar://problem/48444136
Modified: branches/safari-607.1.40.0-branch/Source/WebCore/platform/graphics/cocoa/FontDescriptionCocoa.cpp (242222 => 242223)
--- branches/safari-607.1.40.0-branch/Source/WebCore/platform/graphics/cocoa/FontDescriptionCocoa.cpp 2019-02-28 21:39:52 UTC (rev 242222)
+++ branches/safari-607.1.40.0-branch/Source/WebCore/platform/graphics/cocoa/FontDescriptionCocoa.cpp 2019-02-28 21:41:14 UTC (rev 242223)
@@ -165,7 +165,7 @@
AtomicString FontDescription::platformResolveGenericFamily(UScriptCode script, const AtomicString& locale, const AtomicString& familyName)
{
- if (script == USCRIPT_COMMON)
+ if (locale.isNull() || script == USCRIPT_COMMON)
return nullAtom();
static std::once_flag onceFlag;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
