aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2022-02-20 11:35:15 +0000
committerRene Ladan <rene@FreeBSD.org>2022-02-20 11:42:02 +0000
commita23dfd214ae04e8b4d116ca6411570b684eb5ed6 (patch)
treea42703b6563673398eee97ae6ad4d01eafd77738 /www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp
parent9341f0aca4ecea11124957da5ea6384640745e43 (diff)
downloadports-a23dfd214ae04e8b4d116ca6411570b684eb5ed6.tar.gz
ports-a23dfd214ae04e8b4d116ca6411570b684eb5ed6.zip
www/chromium: update to 98.0.4758.102
- The port now uses the combined patch set for OpenBSD and FreeBSD maintained by Robert Nagy. - Fix build on i386 again. Obtained from: Robert Nagy <robert@openbsd.org> Security: https://vuxml.freebsd.org/freebsd/e12432af-8e73-11ec-8bc4-3065ec8fd3ec.html Security: https://vuxml.freebsd.org/freebsd/e852f43c-846e-11ec-b043-3065ec8fd3ec.html
Diffstat (limited to 'www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp')
-rw-r--r--www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp11
1 files changed, 1 insertions, 10 deletions
diff --git a/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp b/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp
index c31ac6c8c2c4..3c7526dc73b5 100644
--- a/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp
+++ b/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp
@@ -1,4 +1,4 @@
---- skia/ext/SkMemory_new_handler.cpp.orig 2021-04-14 18:41:08 UTC
+--- skia/ext/SkMemory_new_handler.cpp.orig 2022-02-07 13:39:41 UTC
+++ skia/ext/SkMemory_new_handler.cpp
@@ -78,7 +78,7 @@ static void* malloc_nothrow(size_t size) {
// TODO(b.kelemen): we should always use UncheckedMalloc but currently it
@@ -9,12 +9,3 @@
result = malloc(size);
#else
// It's the responsibility of the caller to check the return value.
-@@ -98,7 +98,7 @@ static void* calloc_nothrow(size_t size) {
- // TODO(b.kelemen): we should always use UncheckedCalloc but currently it
- // doesn't work as intended everywhere.
- void* result;
--#if defined(OS_IOS)
-+#if defined(OS_IOS) || defined(OS_BSD)
- result = calloc(1, size);
- #else
- // It's the responsibility of the caller to check the return value.