Uplift of #13892 (squashed) to release

brave · Jun 22, 2022 · deadaaa · deadaaa
1 parent 295eb72
commit deadaaa
Show file tree

Hide file tree

Showing 3 changed files with 698 additions and 660 deletions.
diff --git a/chromium_src/third_party/blink/renderer/core/execution_context/execution_context.cc b/chromium_src/third_party/blink/renderer/core/execution_context/execution_context.cc
@@ -307,12 +307,12 @@ bool BraveSessionCache::AllowFontFamily(
       break;
     case BraveFarblingLevel::BALANCED:
     case BraveFarblingLevel::MAXIMUM: {
-      if (GetAllowedFontFamilies().contains(family_name.Utf8()))
+      if (GetAllowedFontFamilies().contains(family_name.LowerASCII().Ascii()))
         return true;
 #if BUILDFLAG(IS_WIN)
       WTF::String locale = blink::DefaultLanguage().GetString().Left(2);
       if (GetAdditionalAllowedFontFamiliesByLocale(locale).contains(
-              family_name.Utf8()))
+              family_name.LowerASCII().Ascii()))
         return true;
 #endif
       FarblingPRNG prng = MakePseudoRandomGenerator();