diff options
author | Rene Ladan <rene@FreeBSD.org> | 2022-02-20 12:35:15 +0100 |
---|---|---|
committer | Rene Ladan <rene@FreeBSD.org> | 2022-02-20 12:42:02 +0100 |
commit | a23dfd214ae04e8b4d116ca6411570b684eb5ed6 (patch) | |
tree | a42703b6563673398eee97ae6ad4d01eafd77738 /www/chromium/files/patch-ppapi_proxy_file__io__resource.cc | |
parent | graphics/libglvnd: reduce dependency on gcc for everyone on powerpc64* by usi... (diff) |
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-ppapi_proxy_file__io__resource.cc')
-rw-r--r-- | www/chromium/files/patch-ppapi_proxy_file__io__resource.cc | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc b/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc deleted file mode 100644 index 440e8acdfad4..000000000000 --- a/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc +++ /dev/null @@ -1,48 +0,0 @@ ---- ppapi/proxy/file_io_resource.cc.orig 2021-12-14 11:45:09 UTC -+++ ppapi/proxy/file_io_resource.cc -@@ -282,17 +282,19 @@ int32_t FileIOResource::Write(int64_t offset, - - if (check_quota_) { - int64_t increase = 0; -- uint64_t max_offset = 0; -+ // (rene) avoid name collission with /usr/include/vm/vm_map.h on FreeBSD -+ // which also defines max_offset -+ uint64_t _max_offset = 0; - bool append = (open_flags_ & PP_FILEOPENFLAG_APPEND) != 0; - if (append) { - increase = bytes_to_write; - } else { -- max_offset = offset + bytes_to_write; -- if (max_offset > -+ _max_offset = offset + bytes_to_write; -+ if (_max_offset > - static_cast<uint64_t>(std::numeric_limits<int64_t>::max())) { - return PP_ERROR_FAILED; // amount calculation would overflow. - } -- increase = static_cast<int64_t>(max_offset) - max_written_offset_; -+ increase = static_cast<int64_t>(_max_offset) - max_written_offset_; - } - - if (increase > 0) { -@@ -312,7 +314,7 @@ int32_t FileIOResource::Write(int64_t offset, - if (append) - append_mode_write_amount_ += bytes_to_write; - else -- max_written_offset_ = max_offset; -+ max_written_offset_ = _max_offset; - } - } - return WriteValidated(offset, buffer, bytes_to_write, callback); -@@ -588,9 +590,9 @@ void FileIOResource::OnRequestWriteQuotaComplete( - } else { - DCHECK_LE(offset + bytes_to_write - max_written_offset_, granted); - -- int64_t max_offset = offset + bytes_to_write; -- if (max_written_offset_ < max_offset) -- max_written_offset_ = max_offset; -+ int64_t _max_offset = offset + bytes_to_write; -+ if (max_written_offset_ < _max_offset) -+ max_written_offset_ = _max_offset; - } - - if (callback->is_blocking()) { |