commit
aa46cac719
@ -1,5 +1,5 @@
|
||||
SOURCES/pulseaudio-12.2-headers.tar.gz
|
||||
SOURCES/python2.7-2.7.18-19.el9.1.aarch64.rpm
|
||||
SOURCES/python2.7-2.7.18-19.el9.1.src.rpm
|
||||
SOURCES/qtwebengine-everywhere-src-5.15.8-clean.tar.xz
|
||||
SOURCES/pulseaudio-12.2-headers.tar.gz
|
||||
SOURCES/python2.7-2.7.18-19.el9.1.x86_64.rpm
|
||||
SOURCES/qtwebengine-everywhere-src-5.15.12-clean.tar.xz
|
||||
|
@ -1,5 +1,5 @@
|
||||
1d7e3218c2863e2ccbe281ad8633b6a5ea2cde0b SOURCES/pulseaudio-12.2-headers.tar.gz
|
||||
444c75d0acb3f0818af12fb608e4ed65addbf1cf SOURCES/python2.7-2.7.18-19.el9.1.aarch64.rpm
|
||||
b44bd37703d8609abd5bb976dece143c2a4dcf23 SOURCES/python2.7-2.7.18-19.el9.1.src.rpm
|
||||
819159cdf887fad47185f20f66c0166e40bfb481 SOURCES/qtwebengine-everywhere-src-5.15.8-clean.tar.xz
|
||||
1d7e3218c2863e2ccbe281ad8633b6a5ea2cde0b SOURCES/pulseaudio-12.2-headers.tar.gz
|
||||
86d526687ba792f2a692445a66c119deaef2ad69 SOURCES/python2.7-2.7.18-19.el9.1.x86_64.rpm
|
||||
391a862684c4e8e003df71c3fdfe08fb2c738630 SOURCES/qtwebengine-everywhere-src-5.15.12-clean.tar.xz
|
||||
|
@ -0,0 +1,45 @@
|
||||
Avoid calls to the undeclared strlcpy function in libsync. This
|
||||
prevents a build failure with future compilers.
|
||||
|
||||
Submitted upstream: <https://bugreports.qt.io/browse/QTBUG-111440>
|
||||
|
||||
diff -up qtwebengine-everywhere-src-5.15.12/src/3rdparty/chromium/third_party/libsync/BUILD.gn.c99 qtwebengine-everywhere-src-5.15.12/src/3rdparty/chromium/third_party/libsync/BUILD.gn
|
||||
--- qtwebengine-everywhere-src-5.15.12/src/3rdparty/chromium/third_party/libsync/BUILD.gn.c99 2023-02-23 10:54:15.909380015 +0100
|
||||
+++ qtwebengine-everywhere-src-5.15.12/src/3rdparty/chromium/third_party/libsync/BUILD.gn 2023-02-23 11:00:32.019601795 +0100
|
||||
@@ -21,24 +21,15 @@ if (!use_system_libsync) {
|
||||
]
|
||||
}
|
||||
|
||||
- config("libsync_private_config") {
|
||||
- # To suppress the warning caused by strlcpy.
|
||||
- cflags = [ "-Wno-implicit-function-declaration" ]
|
||||
- }
|
||||
-
|
||||
source_set("libsync") {
|
||||
sources = [
|
||||
"src/include/sync/sync.h",
|
||||
"src/sw_sync.h",
|
||||
"src/sync.c",
|
||||
- "strlcpy.c",
|
||||
]
|
||||
|
||||
configs -= [ "//build/config/compiler:chromium_code" ]
|
||||
- configs += [
|
||||
- "//build/config/compiler:no_chromium_code",
|
||||
- ":libsync_private_config",
|
||||
- ]
|
||||
+ configs += [ "//build/config/compiler:no_chromium_code" ]
|
||||
|
||||
public_configs = [ ":libsync_config" ]
|
||||
}
|
||||
diff -up qtwebengine-everywhere-src-5.15.12/src/3rdparty/chromium/third_party/libsync/src/sync.c.c99 qtwebengine-everywhere-src-5.15.12/src/3rdparty/chromium/third_party/libsync/src/sync.c
|
||||
--- qtwebengine-everywhere-src-5.15.12/src/3rdparty/chromium/third_party/libsync/src/sync.c.c99 2023-02-23 10:54:30.650231820 +0100
|
||||
+++ qtwebengine-everywhere-src-5.15.12/src/3rdparty/chromium/third_party/libsync/src/sync.c 2023-02-23 10:54:50.116036131 +0100
|
||||
@@ -29,6 +29,7 @@
|
||||
|
||||
#include <sync/sync.h>
|
||||
|
||||
+#include "../strlcpy.c"
|
||||
|
||||
struct sw_sync_create_fence_data {
|
||||
__u32 value;
|
@ -0,0 +1,372 @@
|
||||
From 0e827b4f741e57538c24d90b63659dbdb0992cb0 Mon Sep 17 00:00:00 2001
|
||||
From: Jorrit Jongma <jorrit@jongma.org>
|
||||
Date: Tue, 12 Apr 2022 17:09:34 +0000
|
||||
Subject: [PATCH] [Backport] [PA] Support 16kb pagesize on Linux+ARM64
|
||||
|
||||
This makes the system pagesize a run-time property.
|
||||
|
||||
ARM64 supports 4kb, 16kb, and 64kb page sizes. Previously, only 4kb
|
||||
was supported by Chromium. This patch adds 16kb support, as is used
|
||||
for example by Asahi Linux on M1 Macs. The rare 64kb case is still
|
||||
not supported due to further changes needed to SlotSpanMetadata.
|
||||
|
||||
The implementation follows the changes made to support run-time page
|
||||
size on macOS. On macOS, the required constants are conveniently
|
||||
injected before any code runs, while on Linux a function call is
|
||||
needed, complicating initialization.
|
||||
|
||||
The new PageCharacteristics structure holds the page size and shift
|
||||
as std::atomic<int> which are initialized on first use.
|
||||
|
||||
Bug: 1301788
|
||||
Change-Id: I8ceead40de53ba7a2ec248bd6ef46f2a521dd29c
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3545665
|
||||
Reviewed-by: Benoit Lize <lizeb@chromium.org>
|
||||
Reviewed-by: Mark Mentovai <mark@chromium.org>
|
||||
Commit-Queue: Mark Mentovai <mark@chromium.org>
|
||||
Cr-Commit-Position: refs/heads/main@{#991588}
|
||||
|
||||
(adapted from commit a704c3a94179e6f3abb28f090d096ced72657d7c)
|
||||
|
||||
Bug-Fedora: 2144200
|
||||
Task-number: QTBUG-108674
|
||||
---
|
||||
.../address_space_randomization.h | 15 ++++++
|
||||
.../page_allocator_constants.h | 51 +++++++++++++++++-
|
||||
.../partition_address_space.cc | 6 +++
|
||||
.../partition_allocator/partition_alloc.cc | 2 +-
|
||||
.../partition_alloc_constants.h | 5 +-
|
||||
.../address_space_randomization.h | 15 ++++++
|
||||
.../partition_allocator/page_allocator.cc | 8 +++
|
||||
.../page_allocator_constants.h | 52 ++++++++++++++++++-
|
||||
.../partition_allocator/partition_alloc.cc | 2 +-
|
||||
.../partition_alloc_constants.h | 5 +-
|
||||
10 files changed, 153 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/src/3rdparty/chromium/base/allocator/partition_allocator/address_space_randomization.h b/src/3rdparty/chromium/base/allocator/partition_allocator/address_space_randomization.h
|
||||
index e77003eab25..31ac05b86f5 100644
|
||||
--- a/src/3rdparty/chromium/base/allocator/partition_allocator/address_space_randomization.h
|
||||
+++ b/src/3rdparty/chromium/base/allocator/partition_allocator/address_space_randomization.h
|
||||
@@ -119,6 +119,21 @@ AslrMask(uintptr_t bits) {
|
||||
return AslrAddress(0x20000000ULL);
|
||||
}
|
||||
|
||||
+ #elif defined(OS_LINUX)
|
||||
+
|
||||
+ // Linux on arm64 can use 39, 42, 48, or 52-bit user space, depending on
|
||||
+ // page size and number of levels of translation pages used. We use
|
||||
+ // 39-bit as base as all setups should support this, lowered to 38-bit
|
||||
+ // as ASLROffset() could cause a carry.
|
||||
+ PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR ALWAYS_INLINE uintptr_t
|
||||
+ ASLRMask() {
|
||||
+ return AslrMask(38);
|
||||
+ }
|
||||
+ PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR ALWAYS_INLINE uintptr_t
|
||||
+ ASLROffset() {
|
||||
+ return AslrAddress(0x1000000000ULL);
|
||||
+ }
|
||||
+
|
||||
#else
|
||||
|
||||
// ARM64 on Linux has 39-bit user space. Use 38 bits since ASLROffset()
|
||||
diff --git a/src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator_constants.h b/src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator_constants.h
|
||||
index c42fe2835ff..dc7486608b9 100644
|
||||
--- a/src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator_constants.h
|
||||
+++ b/src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator_constants.h
|
||||
@@ -24,6 +24,31 @@
|
||||
// elimination.
|
||||
#define PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR __attribute__((const))
|
||||
|
||||
+#elif defined(OS_LINUX) && defined(ARCH_CPU_ARM64)
|
||||
+// This should work for all POSIX (if needed), but currently all other
|
||||
+// supported OS/architecture combinations use either hard-coded values
|
||||
+// (such as x86) or have means to determine these values without needing
|
||||
+// atomics (such as macOS on arm64).
|
||||
+
|
||||
+// Page allocator constants are run-time constant
|
||||
+#define PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR __attribute__((const))
|
||||
+
|
||||
+#include <unistd.h>
|
||||
+#include <atomic>
|
||||
+
|
||||
+namespace base::internal {
|
||||
+
|
||||
+// Holds the current page size and shift, where size = 1 << shift
|
||||
+// Use PageAllocationGranularity(), PageAllocationGranularityShift()
|
||||
+// to initialize and retrieve these values safely.
|
||||
+struct PageCharacteristics {
|
||||
+ std::atomic<int> size;
|
||||
+ std::atomic<int> shift;
|
||||
+};
|
||||
+extern PageCharacteristics page_characteristics;
|
||||
+
|
||||
+} // namespace base::internal
|
||||
+
|
||||
#else
|
||||
|
||||
// When defined, page size constants are fixed at compile time. When not
|
||||
@@ -36,11 +61,17 @@
|
||||
|
||||
#endif
|
||||
|
||||
+namespace base {
|
||||
+// Forward declaration, implementation below
|
||||
+PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR ALWAYS_INLINE size_t
|
||||
+PageAllocationGranularity();
|
||||
+}
|
||||
+
|
||||
namespace {
|
||||
|
||||
#if !defined(OS_APPLE)
|
||||
|
||||
-constexpr ALWAYS_INLINE int PageAllocationGranularityShift() {
|
||||
+PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR ALWAYS_INLINE int PageAllocationGranularityShift() {
|
||||
#if defined(OS_WIN) || defined(ARCH_CPU_PPC64)
|
||||
// Modern ppc64 systems support 4kB (shift = 12) and 64kB (shift = 16) page
|
||||
// sizes. Since 64kB is the de facto standard on the platform and binaries
|
||||
@@ -49,6 +80,15 @@ constexpr ALWAYS_INLINE int PageAllocationGranularityShift() {
|
||||
return 16; // 64kB
|
||||
#elif defined(_MIPS_ARCH_LOONGSON)
|
||||
return 14; // 16kB
|
||||
+#elif defined(OS_LINUX) && defined(ARCH_CPU_ARM64)
|
||||
+ // arm64 supports 4kb (shift = 12), 16kb (shift = 14), and 64kb (shift = 16)
|
||||
+ // page sizes. Retrieve from or initialize cache.
|
||||
+ int shift = base::internal::page_characteristics.shift.load(std::memory_order_relaxed);
|
||||
+ if (UNLIKELY(shift == 0)) {
|
||||
+ shift = __builtin_ctz((int)base::PageAllocationGranularity());
|
||||
+ base::internal::page_characteristics.shift.store(shift, std::memory_order_relaxed);
|
||||
+ }
|
||||
+ return shift;
|
||||
#else
|
||||
return 12; // 4kB
|
||||
#endif
|
||||
@@ -64,6 +104,15 @@ PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR ALWAYS_INLINE size_t
|
||||
PageAllocationGranularity() {
|
||||
#if defined(OS_APPLE)
|
||||
return vm_page_size;
|
||||
+#elif defined(OS_LINUX) && defined(ARCH_CPU_ARM64)
|
||||
+ // arm64 supports 4kb, 16kb, and 64kb page sizes. Retrieve from or
|
||||
+ // initialize cache.
|
||||
+ int size = internal::page_characteristics.size.load(std::memory_order_relaxed);
|
||||
+ if (UNLIKELY(size == 0)) {
|
||||
+ size = getpagesize();
|
||||
+ internal::page_characteristics.size.store(size, std::memory_order_relaxed);
|
||||
+ }
|
||||
+ return size;
|
||||
#else
|
||||
return 1ULL << PageAllocationGranularityShift();
|
||||
#endif
|
||||
diff --git a/src/3rdparty/chromium/base/allocator/partition_allocator/partition_address_space.cc b/src/3rdparty/chromium/base/allocator/partition_allocator/partition_address_space.cc
|
||||
index 03883bcb113..90efc51c838 100644
|
||||
--- a/src/3rdparty/chromium/base/allocator/partition_allocator/partition_address_space.cc
|
||||
+++ b/src/3rdparty/chromium/base/allocator/partition_allocator/partition_address_space.cc
|
||||
@@ -75,6 +75,12 @@ void PartitionAddressSpace::UninitForTesting() {
|
||||
internal::AddressPoolManager::GetInstance()->ResetForTesting();
|
||||
}
|
||||
|
||||
+#if defined(OS_LINUX) && defined(ARCH_CPU_ARM64)
|
||||
+
|
||||
+PageCharacteristics page_characteristics;
|
||||
+
|
||||
+#endif // defined(OS_LINUX) && defined(ARCH_CPU_ARM64)
|
||||
+
|
||||
#endif // defined(PA_HAS_64_BITS_POINTERS)
|
||||
|
||||
} // namespace internal
|
||||
diff --git a/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc.cc b/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc.cc
|
||||
index daeb6d5cb17..7c434b5e697 100644
|
||||
--- a/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc.cc
|
||||
+++ b/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc.cc
|
||||
@@ -522,7 +522,7 @@ static size_t PartitionPurgePage(internal::PartitionPage<thread_safe>* page,
|
||||
#if defined(PAGE_ALLOCATOR_CONSTANTS_ARE_CONSTEXPR)
|
||||
constexpr size_t kMaxSlotCount =
|
||||
(PartitionPageSize() * kMaxPartitionPagesPerSlotSpan) / SystemPageSize();
|
||||
-#elif defined(OS_APPLE)
|
||||
+#elif defined(OS_APPLE) || (defined(OS_LINUX) && defined(ARCH_CPU_ARM64))
|
||||
// It's better for slot_usage to be stack-allocated and fixed-size, which
|
||||
// demands that its size be constexpr. On OS_APPLE, PartitionPageSize() is
|
||||
// always SystemPageSize() << 2, so regardless of what the run time page size
|
||||
diff --git a/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h b/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h
|
||||
index c8268ec30a0..f03ba1e4ab4 100644
|
||||
--- a/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h
|
||||
+++ b/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h
|
||||
@@ -57,10 +57,11 @@ PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR ALWAYS_INLINE int
|
||||
PartitionPageShift() {
|
||||
return 18; // 256 KiB
|
||||
}
|
||||
-#elif defined(OS_APPLE)
|
||||
+#elif defined(OS_APPLE) || \
|
||||
+ (defined(OS_LINUX) && defined(ARCH_CPU_ARM64))
|
||||
PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR ALWAYS_INLINE int
|
||||
PartitionPageShift() {
|
||||
- return vm_page_shift + 2;
|
||||
+ return PageAllocationGranularityShift() + 2;
|
||||
}
|
||||
#else
|
||||
PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR ALWAYS_INLINE int
|
||||
diff --git a/src/3rdparty/chromium/third_party/pdfium/third_party/base/allocator/partition_allocator/address_space_randomization.h b/src/3rdparty/chromium/third_party/pdfium/third_party/base/allocator/partition_allocator/address_space_randomization.h
|
||||
index 28c8271fd68..3957e0cdf76 100644
|
||||
--- a/src/3rdparty/chromium/third_party/pdfium/third_party/base/allocator/partition_allocator/address_space_randomization.h
|
||||
+++ b/src/3rdparty/chromium/third_party/pdfium/third_party/base/allocator/partition_allocator/address_space_randomization.h
|
||||
@@ -120,6 +120,21 @@ AslrMask(uintptr_t bits) {
|
||||
return AslrAddress(0x20000000ULL);
|
||||
}
|
||||
|
||||
+ #elif defined(OS_LINUX)
|
||||
+
|
||||
+ // Linux on arm64 can use 39, 42, 48, or 52-bit user space, depending on
|
||||
+ // page size and number of levels of translation pages used. We use
|
||||
+ // 39-bit as base as all setups should support this, lowered to 38-bit
|
||||
+ // as ASLROffset() could cause a carry.
|
||||
+ PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR ALWAYS_INLINE uintptr_t
|
||||
+ ASLRMask() {
|
||||
+ return AslrMask(38);
|
||||
+ }
|
||||
+ PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR ALWAYS_INLINE uintptr_t
|
||||
+ ASLROffset() {
|
||||
+ return AslrAddress(0x1000000000ULL);
|
||||
+ }
|
||||
+
|
||||
#else
|
||||
|
||||
// ARM64 on Linux has 39-bit user space. Use 38 bits since kASLROffset
|
||||
diff --git a/src/3rdparty/chromium/third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator.cc b/src/3rdparty/chromium/third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator.cc
|
||||
index 91d00d2fbca..597d5f84cb1 100644
|
||||
--- a/src/3rdparty/chromium/third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator.cc
|
||||
+++ b/src/3rdparty/chromium/third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator.cc
|
||||
@@ -255,5 +255,13 @@ uint32_t GetAllocPageErrorCode() {
|
||||
return s_allocPageErrorCode;
|
||||
}
|
||||
|
||||
+#if defined(OS_LINUX) && defined(ARCH_CPU_ARM64)
|
||||
+
|
||||
+namespace internal {
|
||||
+PageCharacteristics page_characteristics;
|
||||
+}
|
||||
+
|
||||
+#endif // defined(OS_LINUX) && defined(ARCH_CPU_ARM64)
|
||||
+
|
||||
} // namespace base
|
||||
} // namespace pdfium
|
||||
diff --git a/src/3rdparty/chromium/third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_constants.h b/src/3rdparty/chromium/third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_constants.h
|
||||
index fdc65ac47b7..f826308839d 100644
|
||||
--- a/src/3rdparty/chromium/third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_constants.h
|
||||
+++ b/src/3rdparty/chromium/third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_constants.h
|
||||
@@ -24,6 +24,31 @@
|
||||
// elimination.
|
||||
#define PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR __attribute__((const))
|
||||
|
||||
+#elif defined(OS_LINUX) && defined(ARCH_CPU_ARM64)
|
||||
+// This should work for all POSIX (if needed), but currently all other
|
||||
+// supported OS/architecture combinations use either hard-coded values
|
||||
+// (such as x86) or have means to determine these values without needing
|
||||
+// atomics (such as macOS on arm64).
|
||||
+
|
||||
+// Page allocator constants are run-time constant
|
||||
+#define PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR __attribute__((const))
|
||||
+
|
||||
+#include <unistd.h>
|
||||
+#include <atomic>
|
||||
+
|
||||
+namespace pdfium::base::internal {
|
||||
+
|
||||
+// Holds the current page size and shift, where size = 1 << shift
|
||||
+// Use PageAllocationGranularity(), PageAllocationGranularityShift()
|
||||
+// to initialize and retrieve these values safely.
|
||||
+struct PageCharacteristics {
|
||||
+ std::atomic<int> size;
|
||||
+ std::atomic<int> shift;
|
||||
+};
|
||||
+extern PageCharacteristics page_characteristics;
|
||||
+
|
||||
+} // namespace base::internal
|
||||
+
|
||||
#else
|
||||
|
||||
// When defined, page size constants are fixed at compile time. When not
|
||||
@@ -37,11 +62,18 @@
|
||||
#endif
|
||||
|
||||
namespace pdfium {
|
||||
+
|
||||
+namespace base {
|
||||
+// Forward declaration, implementation below
|
||||
+PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR ALWAYS_INLINE size_t
|
||||
+PageAllocationGranularity();
|
||||
+}
|
||||
+
|
||||
namespace {
|
||||
|
||||
#if !defined(OS_APPLE)
|
||||
|
||||
-constexpr ALWAYS_INLINE int PageAllocationGranularityShift() {
|
||||
+PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR ALWAYS_INLINE int PageAllocationGranularityShift() {
|
||||
#if defined(OS_WIN) || defined(ARCH_CPU_PPC64)
|
||||
// Modern ppc64 systems support 4kB (shift = 12) and 64kB (shift = 16) page
|
||||
// sizes. Since 64kB is the de facto standard on the platform and binaries
|
||||
@@ -50,6 +82,15 @@ constexpr ALWAYS_INLINE int PageAllocationGranularityShift() {
|
||||
return 16; // 64kB
|
||||
#elif defined(_MIPS_ARCH_LOONGSON)
|
||||
return 14; // 16kB
|
||||
+#elif defined(OS_LINUX) && defined(ARCH_CPU_ARM64)
|
||||
+ // arm64 supports 4kb (shift = 12), 16kb (shift = 14), and 64kb (shift = 16)
|
||||
+ // page sizes. Retrieve from or initialize cache.
|
||||
+ int shift = base::internal::page_characteristics.shift.load(std::memory_order_relaxed);
|
||||
+ if (UNLIKELY(shift == 0)) {
|
||||
+ shift = __builtin_ctz((int)base::PageAllocationGranularity());
|
||||
+ base::internal::page_characteristics.shift.store(shift, std::memory_order_relaxed);
|
||||
+ }
|
||||
+ return shift;
|
||||
#else
|
||||
return 12; // 4kB
|
||||
#endif
|
||||
@@ -65,6 +106,15 @@ PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR ALWAYS_INLINE size_t
|
||||
PageAllocationGranularity() {
|
||||
#if defined(OS_APPLE)
|
||||
return vm_page_size;
|
||||
+#elif defined(OS_LINUX) && defined(ARCH_CPU_ARM64)
|
||||
+ // arm64 supports 4kb, 16kb, and 64kb page sizes. Retrieve from or
|
||||
+ // initialize cache.
|
||||
+ int size = internal::page_characteristics.size.load(std::memory_order_relaxed);
|
||||
+ if (UNLIKELY(size == 0)) {
|
||||
+ size = getpagesize();
|
||||
+ internal::page_characteristics.size.store(size, std::memory_order_relaxed);
|
||||
+ }
|
||||
+ return size;
|
||||
#else
|
||||
return 1ULL << PageAllocationGranularityShift();
|
||||
#endif
|
||||
diff --git a/src/3rdparty/chromium/third_party/pdfium/third_party/base/allocator/partition_allocator/partition_alloc.cc b/src/3rdparty/chromium/third_party/pdfium/third_party/base/allocator/partition_allocator/partition_alloc.cc
|
||||
index 2e5e87fa7e6..89b9f6217a6 100644
|
||||
--- a/src/3rdparty/chromium/third_party/pdfium/third_party/base/allocator/partition_allocator/partition_alloc.cc
|
||||
+++ b/src/3rdparty/chromium/third_party/pdfium/third_party/base/allocator/partition_allocator/partition_alloc.cc
|
||||
@@ -486,7 +486,7 @@ static size_t PartitionPurgePage(internal::PartitionPage* page, bool discard) {
|
||||
#if defined(PAGE_ALLOCATOR_CONSTANTS_ARE_CONSTEXPR)
|
||||
constexpr size_t kMaxSlotCount =
|
||||
(PartitionPageSize() * kMaxPartitionPagesPerSlotSpan) / SystemPageSize();
|
||||
-#elif defined(OS_APPLE)
|
||||
+#elif defined(OS_APPLE) || (defined(OS_LINUX) && defined(ARCH_CPU_ARM64))
|
||||
// It's better for slot_usage to be stack-allocated and fixed-size, which
|
||||
// demands that its size be constexpr. On OS_APPLE, PartitionPageSize() is
|
||||
// always SystemPageSize() << 2, so regardless of what the run time page size
|
||||
diff --git a/src/3rdparty/chromium/third_party/pdfium/third_party/base/allocator/partition_allocator/partition_alloc_constants.h b/src/3rdparty/chromium/third_party/pdfium/third_party/base/allocator/partition_allocator/partition_alloc_constants.h
|
||||
index 71d63ba4146..a6d83626741 100644
|
||||
--- a/src/3rdparty/chromium/third_party/pdfium/third_party/base/allocator/partition_allocator/partition_alloc_constants.h
|
||||
+++ b/src/3rdparty/chromium/third_party/pdfium/third_party/base/allocator/partition_allocator/partition_alloc_constants.h
|
||||
@@ -50,10 +50,11 @@ PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR ALWAYS_INLINE int
|
||||
PartitionPageShift() {
|
||||
return 18; // 256 KiB
|
||||
}
|
||||
-#elif defined(OS_APPLE)
|
||||
+#elif defined(OS_APPLE) || \
|
||||
+ (defined(OS_LINUX) && defined(ARCH_CPU_ARM64))
|
||||
PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR ALWAYS_INLINE int
|
||||
PartitionPageShift() {
|
||||
- return vm_page_shift + 2;
|
||||
+ return PageAllocationGranularityShift() + 2;
|
||||
}
|
||||
#else
|
||||
PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR ALWAYS_INLINE int
|
||||
--
|
||||
2.38.1
|
||||
|
@ -0,0 +1,485 @@
|
||||
diff --git a/src/3rdparty/chromium/base/debug/profiler.h b/src/3rdparty/chromium/base/debug/profiler.h
|
||||
index 1229e0623..c7ed55e70 100644
|
||||
--- a/src/3rdparty/chromium/base/debug/profiler.h
|
||||
+++ b/src/3rdparty/chromium/base/debug/profiler.h
|
||||
@@ -5,6 +5,7 @@
|
||||
#ifndef BASE_DEBUG_PROFILER_H_
|
||||
#define BASE_DEBUG_PROFILER_H_
|
||||
|
||||
+#include <cstdint>
|
||||
#include <stddef.h>
|
||||
|
||||
#include <string>
|
||||
diff --git a/src/3rdparty/chromium/cc/trees/target_property.cc b/src/3rdparty/chromium/cc/trees/target_property.cc
|
||||
index ed2062557..036c870b2 100644
|
||||
--- a/src/3rdparty/chromium/cc/trees/target_property.cc
|
||||
+++ b/src/3rdparty/chromium/cc/trees/target_property.cc
|
||||
@@ -4,6 +4,10 @@
|
||||
|
||||
#include "cc/trees/target_property.h"
|
||||
|
||||
+#include <cstdint>
|
||||
+
|
||||
+#include <cstdint>
|
||||
+
|
||||
namespace cc {
|
||||
|
||||
static_assert(TargetProperty::LAST_TARGET_PROPERTY < kMaxTargetPropertyIndex,
|
||||
diff --git a/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h b/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h
|
||||
index 3896bc6e7..b93843dc1 100644
|
||||
--- a/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h
|
||||
+++ b/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h
|
||||
@@ -5,6 +5,7 @@
|
||||
#ifndef CONTENT_PUBLIC_BROWSER_BROWSING_DATA_REMOVER_DELEGATE_H_
|
||||
#define CONTENT_PUBLIC_BROWSER_BROWSING_DATA_REMOVER_DELEGATE_H_
|
||||
|
||||
+#include <cstdint>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include "base/callback_forward.h"
|
||||
diff --git a/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc b/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc
|
||||
index 213b6301c..d77be3f14 100644
|
||||
--- a/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc
|
||||
+++ b/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc
|
||||
@@ -4,6 +4,8 @@
|
||||
|
||||
#include "device/base/synchronization/one_writer_seqlock.h"
|
||||
|
||||
+#include <cstdint>
|
||||
+
|
||||
namespace device {
|
||||
|
||||
OneWriterSeqLock::OneWriterSeqLock() : sequence_(0) {}
|
||||
diff --git a/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h b/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h
|
||||
index 0c27ae710..b64f82f75 100644
|
||||
--- a/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h
|
||||
+++ b/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h
|
||||
@@ -5,6 +5,7 @@
|
||||
#ifndef DEVICE_BLUETOOTH_PUBLIC_CPP_BLUETOOTH_UUID_H_
|
||||
#define DEVICE_BLUETOOTH_PUBLIC_CPP_BLUETOOTH_UUID_H_
|
||||
|
||||
+#include <cstdint>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
diff --git a/src/3rdparty/chromium/extensions/common/constants.h b/src/3rdparty/chromium/extensions/common/constants.h
|
||||
index 747906a06..fec888a11 100644
|
||||
--- a/src/3rdparty/chromium/extensions/common/constants.h
|
||||
+++ b/src/3rdparty/chromium/extensions/common/constants.h
|
||||
@@ -11,6 +11,8 @@
|
||||
#include "components/version_info/channel.h"
|
||||
#include "ui/base/layout.h"
|
||||
|
||||
+#include <cstdint>
|
||||
+
|
||||
namespace extensions {
|
||||
|
||||
// Scheme we serve extension content from.
|
||||
diff --git a/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h b/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h
|
||||
index 83615b30c..8fa9fb1f6 100644
|
||||
--- a/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h
|
||||
+++ b/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h
|
||||
@@ -5,6 +5,8 @@
|
||||
#ifndef GPU_COMMAND_BUFFER_COMMON_WEBGPU_CMD_ENUMS_H_
|
||||
#define GPU_COMMAND_BUFFER_COMMON_WEBGPU_CMD_ENUMS_H_
|
||||
|
||||
+#include <cstdint>
|
||||
+
|
||||
namespace gpu {
|
||||
namespace webgpu {
|
||||
|
||||
diff --git a/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_format.h b/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_format.h
|
||||
index 286a41c43..25d2413df 100644
|
||||
--- a/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_format.h
|
||||
+++ b/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_format.h
|
||||
@@ -5,6 +5,7 @@
|
||||
#ifndef GPU_COMMAND_BUFFER_COMMON_WEBGPU_CMD_FORMAT_H_
|
||||
#define GPU_COMMAND_BUFFER_COMMON_WEBGPU_CMD_FORMAT_H_
|
||||
|
||||
+#include <cstdint>
|
||||
#include <string.h>
|
||||
|
||||
#include "gpu/command_buffer/common/gl2_types.h"
|
||||
diff --git a/src/3rdparty/chromium/gpu/command_buffer/service/shared_context_state.h b/src/3rdparty/chromium/gpu/command_buffer/service/shared_context_state.h
|
||||
index bcba574d5..f4916bed7 100644
|
||||
--- a/src/3rdparty/chromium/gpu/command_buffer/service/shared_context_state.h
|
||||
+++ b/src/3rdparty/chromium/gpu/command_buffer/service/shared_context_state.h
|
||||
@@ -5,6 +5,7 @@
|
||||
#ifndef GPU_COMMAND_BUFFER_SERVICE_SHARED_CONTEXT_STATE_H_
|
||||
#define GPU_COMMAND_BUFFER_SERVICE_SHARED_CONTEXT_STATE_H_
|
||||
|
||||
+#include <cstdint>
|
||||
#include <memory>
|
||||
#include <vector>
|
||||
|
||||
diff --git a/src/3rdparty/chromium/gpu/config/device_perf_info.h b/src/3rdparty/chromium/gpu/config/device_perf_info.h
|
||||
index e33874ba3..824a207a2 100644
|
||||
--- a/src/3rdparty/chromium/gpu/config/device_perf_info.h
|
||||
+++ b/src/3rdparty/chromium/gpu/config/device_perf_info.h
|
||||
@@ -5,6 +5,7 @@
|
||||
#ifndef GPU_CONFIG_DEVICE_PERF_INFO_H_
|
||||
#define GPU_CONFIG_DEVICE_PERF_INFO_H_
|
||||
|
||||
+#include <cstdint>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
diff --git a/src/3rdparty/chromium/gpu/config/gpu_feature_info.h b/src/3rdparty/chromium/gpu/config/gpu_feature_info.h
|
||||
index 027f1a5af..70759b2ae 100644
|
||||
--- a/src/3rdparty/chromium/gpu/config/gpu_feature_info.h
|
||||
+++ b/src/3rdparty/chromium/gpu/config/gpu_feature_info.h
|
||||
@@ -5,6 +5,7 @@
|
||||
#ifndef GPU_CONFIG_GPU_FEATURE_INFO_H_
|
||||
#define GPU_CONFIG_GPU_FEATURE_INFO_H_
|
||||
|
||||
+#include <cstdint>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
diff --git a/src/3rdparty/chromium/gpu/config/gpu_preferences.h b/src/3rdparty/chromium/gpu/config/gpu_preferences.h
|
||||
index 6b8587151..e2bc6b90f 100644
|
||||
--- a/src/3rdparty/chromium/gpu/config/gpu_preferences.h
|
||||
+++ b/src/3rdparty/chromium/gpu/config/gpu_preferences.h
|
||||
@@ -5,6 +5,7 @@
|
||||
#ifndef GPU_CONFIG_GPU_PREFERENCES_H_
|
||||
#define GPU_CONFIG_GPU_PREFERENCES_H_
|
||||
|
||||
+#include <cstdint>
|
||||
#include <stddef.h>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
diff --git a/src/3rdparty/chromium/gpu/config/gpu_util.h b/src/3rdparty/chromium/gpu/config/gpu_util.h
|
||||
index b4d6dfb30..0dc300a9f 100644
|
||||
--- a/src/3rdparty/chromium/gpu/config/gpu_util.h
|
||||
+++ b/src/3rdparty/chromium/gpu/config/gpu_util.h
|
||||
@@ -5,6 +5,8 @@
|
||||
#ifndef GPU_CONFIG_GPU_UTIL_H_
|
||||
#define GPU_CONFIG_GPU_UTIL_H_
|
||||
|
||||
+#include <cstdint>
|
||||
+
|
||||
#include "build/build_config.h"
|
||||
#include "gpu/config/gpu_feature_info.h"
|
||||
#include "gpu/gpu_export.h"
|
||||
diff --git a/src/3rdparty/chromium/net/base/parse_number.h b/src/3rdparty/chromium/net/base/parse_number.h
|
||||
index 0b4cfc1f8..55e9bfa8e 100644
|
||||
--- a/src/3rdparty/chromium/net/base/parse_number.h
|
||||
+++ b/src/3rdparty/chromium/net/base/parse_number.h
|
||||
@@ -9,6 +9,8 @@
|
||||
#include "base/strings/string_piece.h"
|
||||
#include "net/base/net_export.h"
|
||||
|
||||
+#include <cstdint>
|
||||
+
|
||||
// This file contains utility functions for parsing numbers, in the context of
|
||||
// network protocols.
|
||||
//
|
||||
diff --git a/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h b/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h
|
||||
index 9e506b555..cfb03bfe2 100644
|
||||
--- a/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h
|
||||
+++ b/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h
|
||||
@@ -5,6 +5,7 @@
|
||||
#ifndef NET_COOKIES_COOKIE_INCLUSION_STATUS_H_
|
||||
#define NET_COOKIES_COOKIE_INCLUSION_STATUS_H_
|
||||
|
||||
+#include <cstdint>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
diff --git a/src/3rdparty/chromium/pdf/document_attachment_info.h b/src/3rdparty/chromium/pdf/document_attachment_info.h
|
||||
index 254398e62..22038e755 100644
|
||||
--- a/src/3rdparty/chromium/pdf/document_attachment_info.h
|
||||
+++ b/src/3rdparty/chromium/pdf/document_attachment_info.h
|
||||
@@ -7,6 +7,8 @@
|
||||
|
||||
#include "base/strings/string16.h"
|
||||
|
||||
+#include <cstdint>
|
||||
+
|
||||
namespace chrome_pdf {
|
||||
|
||||
struct DocumentAttachmentInfo {
|
||||
diff --git a/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h b/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h
|
||||
index ac0b31a75..5d1c421d0 100644
|
||||
--- a/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h
|
||||
+++ b/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h
|
||||
@@ -38,6 +38,10 @@ namespace pp {
|
||||
/// As a further optimization, we can add support for this later.
|
||||
class ThreadSafeThreadTraits {
|
||||
public:
|
||||
+
|
||||
+ typedef pp::Lock Lock;
|
||||
+ typedef pp::AutoLock AutoLock;
|
||||
+
|
||||
class RefCount {
|
||||
public:
|
||||
/// Default constructor. In debug mode, this checks that the object is being
|
||||
@@ -67,8 +71,6 @@ class ThreadSafeThreadTraits {
|
||||
int32_t ref_;
|
||||
};
|
||||
|
||||
- typedef pp::Lock Lock;
|
||||
- typedef pp::AutoLock AutoLock;
|
||||
};
|
||||
|
||||
/// The non-thread-safe version of thread traits. Using this class as the
|
||||
diff --git a/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h b/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h
|
||||
index a9b9e137d..6f1122c42 100644
|
||||
--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h
|
||||
+++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h
|
||||
@@ -19,6 +19,7 @@
|
||||
#include <limits.h>
|
||||
|
||||
#include <cstddef>
|
||||
+#include <cstdint>
|
||||
#include <cstring>
|
||||
#include <ostream>
|
||||
|
||||
diff --git a/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h b/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h
|
||||
index 9911546b9..48b660db3 100644
|
||||
--- a/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h
|
||||
+++ b/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h
|
||||
@@ -12,6 +12,7 @@
|
||||
|
||||
#include <algorithm>
|
||||
#include <array>
|
||||
+#include <cstdint>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
diff --git a/src/3rdparty/chromium/third_party/angle/src/common/angleutils.h b/src/3rdparty/chromium/third_party/angle/src/common/angleutils.h
|
||||
index f669d7df3..8f391fdd7 100644
|
||||
--- a/src/3rdparty/chromium/third_party/angle/src/common/angleutils.h
|
||||
+++ b/src/3rdparty/chromium/third_party/angle/src/common/angleutils.h
|
||||
@@ -15,6 +15,7 @@
|
||||
# include "absl/container/flat_hash_map.h"
|
||||
#endif // defined(ANGLE_USE_ABSEIL)
|
||||
|
||||
+#include <cstdint>
|
||||
#include <climits>
|
||||
#include <cstdarg>
|
||||
#include <cstddef>
|
||||
diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h
|
||||
index c7e4f2b37..e491a1f68 100644
|
||||
--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h
|
||||
+++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h
|
||||
@@ -33,6 +33,7 @@
|
||||
#include <assert.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
+#include <cstdint>
|
||||
#include <string>
|
||||
|
||||
#include "client/linux/handler/microdump_extra_info.h"
|
||||
diff --git a/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc b/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc
|
||||
index 8c8f4fe08..931782214 100644
|
||||
--- a/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc
|
||||
+++ b/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc
|
||||
@@ -30,6 +30,7 @@
|
||||
#include <cstddef>
|
||||
#include <cstdint>
|
||||
#include <cstring>
|
||||
+#include <cstdio>
|
||||
#include <new>
|
||||
#include <utility>
|
||||
|
||||
diff --git a/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h b/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h
|
||||
index d2731dac7..46bc87ef9 100644
|
||||
--- a/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h
|
||||
+++ b/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h
|
||||
@@ -5,6 +5,8 @@
|
||||
#ifndef CONSTANTS_ANNOTATION_FLAGS_H_
|
||||
#define CONSTANTS_ANNOTATION_FLAGS_H_
|
||||
|
||||
+#include <cstdint>
|
||||
+
|
||||
namespace pdfium {
|
||||
namespace annotation_flags {
|
||||
|
||||
diff --git a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h
|
||||
index 1b4c53815..472042fab 100644
|
||||
--- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h
|
||||
+++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h
|
||||
@@ -18,6 +18,7 @@
|
||||
#define INCLUDE_PERFETTO_EXT_BASE_UUID_H_
|
||||
|
||||
#include <array>
|
||||
+#include <cstdint>
|
||||
#include <string>
|
||||
|
||||
#include "perfetto/ext/base/optional.h"
|
||||
diff --git a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h
|
||||
index 74cc9583c..2a00b3b94 100644
|
||||
--- a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h
|
||||
+++ b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h
|
||||
@@ -21,6 +21,8 @@
|
||||
#include "perfetto/trace_processor/status.h"
|
||||
#include "src/trace_processor/trace_blob_view.h"
|
||||
|
||||
+#include <cstdint>
|
||||
+
|
||||
namespace perfetto {
|
||||
|
||||
namespace protos {
|
||||
diff --git a/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp b/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
|
||||
index 503ed08ff..59c755b84 100644
|
||||
--- a/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
|
||||
+++ b/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
|
||||
@@ -12,6 +12,10 @@
|
||||
#include <algorithm>
|
||||
#include <iterator>
|
||||
|
||||
+#include <string.h>
|
||||
+#include <algorithm>
|
||||
+#include <iterator>
|
||||
+
|
||||
static constexpr const char* gColorNames[] = {
|
||||
"aliceblue",
|
||||
"antiquewhite",
|
||||
diff --git a/src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h b/src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h
|
||||
index 3aa7e9df2..3cfc8d6a3 100644
|
||||
--- a/src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h
|
||||
+++ b/src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h
|
||||
@@ -11,6 +11,7 @@
|
||||
#ifndef CALL_RTP_DEMUXER_H_
|
||||
#define CALL_RTP_DEMUXER_H_
|
||||
|
||||
+#include <cstdint>
|
||||
#include <map>
|
||||
#include <set>
|
||||
#include <string>
|
||||
diff --git a/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h b/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h
|
||||
index 7a936f23e..21951a1d2 100644
|
||||
--- a/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h
|
||||
+++ b/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h
|
||||
@@ -12,6 +12,7 @@
|
||||
#ifndef RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_
|
||||
#define RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_
|
||||
|
||||
+#include <cstdint>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
diff --git a/src/3rdparty/chromium/ui/events/gesture_event_details.h b/src/3rdparty/chromium/ui/events/gesture_event_details.h
|
||||
index d20416738..8dadab3d0 100644
|
||||
--- a/src/3rdparty/chromium/ui/events/gesture_event_details.h
|
||||
+++ b/src/3rdparty/chromium/ui/events/gesture_event_details.h
|
||||
@@ -5,6 +5,7 @@
|
||||
#ifndef UI_EVENTS_GESTURE_DETECTION_GESTURE_EVENT_DETAILS_H_
|
||||
#define UI_EVENTS_GESTURE_DETECTION_GESTURE_EVENT_DETAILS_H_
|
||||
|
||||
+#include <cstdint>
|
||||
#include <string.h>
|
||||
|
||||
#include "base/check_op.h"
|
||||
diff --git a/src/3rdparty/chromium/ui/events/types/scroll_types.h b/src/3rdparty/chromium/ui/events/types/scroll_types.h
|
||||
index 7ff15f0fc..136cebc09 100644
|
||||
--- a/src/3rdparty/chromium/ui/events/types/scroll_types.h
|
||||
+++ b/src/3rdparty/chromium/ui/events/types/scroll_types.h
|
||||
@@ -5,6 +5,8 @@
|
||||
#ifndef UI_EVENTS_TYPES_SCROLL_TYPES_H_
|
||||
#define UI_EVENTS_TYPES_SCROLL_TYPES_H_
|
||||
|
||||
+#include <cstdint>
|
||||
+
|
||||
namespace ui {
|
||||
|
||||
enum class ScrollGranularity : uint8_t {
|
||||
diff --git a/src/3rdparty/chromium/ui/gl/gl_surface_glx.cc b/src/3rdparty/chromium/ui/gl/gl_surface_glx.cc
|
||||
index 1d5527691..ef9d5ce13 100644
|
||||
--- a/src/3rdparty/chromium/ui/gl/gl_surface_glx.cc
|
||||
+++ b/src/3rdparty/chromium/ui/gl/gl_surface_glx.cc
|
||||
@@ -4,6 +4,7 @@
|
||||
|
||||
#include "ui/gl/gl_surface_glx.h"
|
||||
|
||||
+#include <cstdint>
|
||||
#include <utility>
|
||||
|
||||
#include "base/bind.h"
|
||||
diff --git a/src/3rdparty/chromium/ui/gl/gl_surface_glx.h b/src/3rdparty/chromium/ui/gl/gl_surface_glx.h
|
||||
index ab612cd87..2178d8514 100644
|
||||
--- a/src/3rdparty/chromium/ui/gl/gl_surface_glx.h
|
||||
+++ b/src/3rdparty/chromium/ui/gl/gl_surface_glx.h
|
||||
@@ -5,6 +5,7 @@
|
||||
#ifndef UI_GL_GL_SURFACE_GLX_H_
|
||||
#define UI_GL_GL_SURFACE_GLX_H_
|
||||
|
||||
+#include <cstdint>
|
||||
#include <stdint.h>
|
||||
|
||||
#include <memory>
|
||||
diff --git a/src/3rdparty/chromium/v8/src/base/logging.h b/src/3rdparty/chromium/v8/src/base/logging.h
|
||||
index fe39f9882..dbe130581 100644
|
||||
--- a/src/3rdparty/chromium/v8/src/base/logging.h
|
||||
+++ b/src/3rdparty/chromium/v8/src/base/logging.h
|
||||
@@ -5,6 +5,7 @@
|
||||
#ifndef V8_BASE_LOGGING_H_
|
||||
#define V8_BASE_LOGGING_H_
|
||||
|
||||
+#include <cstdint>
|
||||
#include <cstring>
|
||||
#include <sstream>
|
||||
#include <string>
|
||||
diff --git a/src/3rdparty/chromium/v8/src/base/macros.h b/src/3rdparty/chromium/v8/src/base/macros.h
|
||||
index 37cab78f0..4220eacbb 100644
|
||||
--- a/src/3rdparty/chromium/v8/src/base/macros.h
|
||||
+++ b/src/3rdparty/chromium/v8/src/base/macros.h
|
||||
@@ -5,6 +5,7 @@
|
||||
#ifndef V8_BASE_MACROS_H_
|
||||
#define V8_BASE_MACROS_H_
|
||||
|
||||
+#include <cstdint>
|
||||
#include <limits>
|
||||
#include <type_traits>
|
||||
|
||||
diff --git a/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h b/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h
|
||||
index c1d69c18f..eb33c6816 100644
|
||||
--- a/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h
|
||||
+++ b/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h
|
||||
@@ -5,6 +5,7 @@
|
||||
#ifndef V8_INSPECTOR_V8_STRING_CONVERSIONS_H_
|
||||
#define V8_INSPECTOR_V8_STRING_CONVERSIONS_H_
|
||||
|
||||
+#include <cstdint>
|
||||
#include <string>
|
||||
|
||||
// Conversion routines between UT8 and UTF16, used by string-16.{h,cc}. You may
|
||||
diff --git a/src/core/browsing_data_remover_delegate_qt.h b/src/core/browsing_data_remover_delegate_qt.h
|
||||
index a10409f39..b9f5e59d8 100644
|
||||
--- a/src/core/browsing_data_remover_delegate_qt.h
|
||||
+++ b/src/core/browsing_data_remover_delegate_qt.h
|
||||
@@ -42,6 +42,8 @@
|
||||
|
||||
#include "content/public/browser/browsing_data_remover_delegate.h"
|
||||
|
||||
+#include <cstdint>
|
||||
+
|
||||
namespace QtWebEngineCore {
|
||||
|
||||
class BrowsingDataRemoverDelegateQt : public content::BrowsingDataRemoverDelegate {
|
||||
diff --git a/src/3rdparty/chromium/third_party/xcbproto/src/src/present.xml b/src/3rdparty/chromium/third_party/xcbproto/src/src/present.xml
|
||||
index fb06e73..f20c11e 100644
|
||||
--- a/src/3rdparty/chromium/third_party/xcbproto/src/src/present.xml
|
||||
+++ b/src/3rdparty/chromium/third_party/xcbproto/src/src/present.xml
|
||||
@@ -89,7 +89,7 @@ OF THIS SOFTWARE.
|
||||
</reply>
|
||||
</request>
|
||||
|
||||
- <request name="Pixmap" opcode="1">
|
||||
+ <request name="PresentPixmap" opcode="1">
|
||||
<required_start_align align="8" />
|
||||
<field type="WINDOW" name="window" />
|
||||
<field type="PIXMAP" name="pixmap" />
|
||||
diff --git a/src/3rdparty/chromium/extensions/browser/api/audio/audio_device_id_calculator.h b/src/3rdparty/chromium/extensions/browser/api/audio/audio_device_id_calculator.h
|
||||
index 9d2858177..d263f6703 100644
|
||||
--- a/src/3rdparty/chromium/extensions/browser/api/audio/audio_device_id_calculator.h
|
||||
+++ b/src/3rdparty/chromium/extensions/browser/api/audio/audio_device_id_calculator.h
|
||||
@@ -5,6 +5,7 @@
|
||||
#ifndef EXTENSIONS_BROWSER_API_AUDIO_AUDIO_DEVICE_ID_CALCULATOR_H_
|
||||
#define EXTENSIONS_BROWSER_API_AUDIO_AUDIO_DEVICE_ID_CALCULATOR_H_
|
||||
|
||||
+#include <cstdint>
|
||||
#include <map>
|
||||
#include <string>
|
||||
|
@ -0,0 +1,15 @@
|
||||
diff --git a/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp b/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
|
||||
index 7260365..503ed08 100644
|
||||
--- a/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
|
||||
+++ b/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
|
||||
@@ -8,6 +8,10 @@
|
||||
|
||||
#include "include/utils/SkParse.h"
|
||||
|
||||
+#include <string.h>
|
||||
+#include <algorithm>
|
||||
+#include <iterator>
|
||||
+
|
||||
static constexpr const char* gColorNames[] = {
|
||||
"aliceblue",
|
||||
"antiquewhite",
|
Loading…
Reference in new issue