Title: [282507] releases/WebKitGTK/webkit-2.32/Source/WebCore
Revision
282507
Author
[email protected]
Date
2021-09-16 01:31:53 -0700 (Thu, 16 Sep 2021)

Log Message

Merge r276015 - Empty value is added in codePointsFromString in CSSFontFaceSet::matchingFacesExcludingPreinstalledFonts
https://bugs.webkit.org/show_bug.cgi?id=223857

Reviewed by Darin Adler.

Use UnsignedWithZeroKeyHashTraits in codePointsFromString() to avoid it.

* css/CSSFontFaceSet.cpp:
(WebCore::codePointsFromString):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog (282506 => 282507)


--- releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog	2021-09-16 08:31:45 UTC (rev 282506)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog	2021-09-16 08:31:53 UTC (rev 282507)
@@ -1,3 +1,15 @@
+2021-04-09  Sergio Villar Senin  <[email protected]>
+
+        Empty value is added in codePointsFromString in CSSFontFaceSet::matchingFacesExcludingPreinstalledFonts
+        https://bugs.webkit.org/show_bug.cgi?id=223857
+
+        Reviewed by Darin Adler.
+
+        Use UnsignedWithZeroKeyHashTraits in codePointsFromString() to avoid it.
+
+        * css/CSSFontFaceSet.cpp:
+        (WebCore::codePointsFromString):
+
 2021-04-15  Zalan Bujtas  <[email protected]>
 
         [RenderTreeBuilder] Cleanup the inline tree when moving subtrees

Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/css/CSSFontFaceSet.cpp (282506 => 282507)


--- releases/WebKitGTK/webkit-2.32/Source/WebCore/css/CSSFontFaceSet.cpp	2021-09-16 08:31:45 UTC (rev 282506)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/css/CSSFontFaceSet.cpp	2021-09-16 08:31:53 UTC (rev 282507)
@@ -330,9 +330,10 @@
     return {{ weightSelectionValue, stretchSelectionValue, styleSelectionValue }};
 }
 
-static HashSet<UChar32> codePointsFromString(StringView stringView)
+using CodePointsMap = HashSet<UChar32, DefaultHash<UChar32>, WTF::UnsignedWithZeroKeyHashTraits<UChar32>>;
+static CodePointsMap codePointsFromString(StringView stringView)
 {
-    HashSet<UChar32> result;
+    CodePointsMap result;
     auto graphemeClusters = stringView.graphemeClusters();
     for (auto cluster : graphemeClusters) {
         ASSERT(cluster.length() > 0);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to