diff options
author | Robert Nagy <robert@openbsd.org> | 2022-03-29 22:42:38 +0200 |
---|---|---|
committer | Rene Ladan <rene@FreeBSD.org> | 2022-03-29 23:12:41 +0200 |
commit | d2c7aaaca13965ed2f7b6d3bd4930b5561fdf682 (patch) | |
tree | af8ff48b5ed19039f09ff491783c4d806738009f /www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc | |
parent | sysutils/py-salt: Fix TCP transport (diff) |
www/chromium: update to 100.0.4896.60
Enable some more unit tests.
Security: ab2d7f62-af9d-11ec-a0b8-3065ec8fd3ec
(cherry picked from commit 1e683edf9a258d43c95b485ad96f5c39860770cb)
Diffstat (limited to 'www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc')
-rw-r--r-- | www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc index 7450661e5c84..957a508124f0 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc @@ -1,20 +1,20 @@ ---- third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc.orig 2021-09-14 01:52:03 UTC +--- third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc.orig 2022-03-25 21:59:56 UTC +++ third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc -@@ -7,7 +7,7 @@ - #if defined(OS_ANDROID) +@@ -9,7 +9,7 @@ + #if BUILDFLAG(IS_ANDROID) #include "third_party/blink/public/mojom/font_unique_name_lookup/font_unique_name_lookup.mojom-blink.h" #include "third_party/blink/renderer/platform/fonts/android/font_unique_name_lookup_android.h" --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "third_party/blink/renderer/platform/fonts/linux/font_unique_name_lookup_linux.h" - #elif defined(OS_WIN) + #elif BUILDFLAG(IS_WIN) #include "third_party/blink/renderer/platform/fonts/win/font_unique_name_lookup_win.h" -@@ -22,7 +22,7 @@ std::unique_ptr<FontUniqueNameLookup> +@@ -24,7 +24,7 @@ std::unique_ptr<FontUniqueNameLookup> FontUniqueNameLookup::GetPlatformUniqueNameLookup() { - #if defined(OS_ANDROID) + #if BUILDFLAG(IS_ANDROID) return std::make_unique<FontUniqueNameLookupAndroid>(); --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) return std::make_unique<FontUniqueNameLookupLinux>(); - #elif defined(OS_WIN) + #elif BUILDFLAG(IS_WIN) return std::make_unique<FontUniqueNameLookupWin>(); |