commit 151ec02bc547f4d0a52a2386b12e0bb17e89dd4d
author Arthur Sonzogni <arthursonzogni@chromium.org> Thu May 23 16:32:24 2024 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu May 23 16:32:24 2024 +0000
tree 02fb19e1725bc08c7ac0de0cb33f9c6259bfc7a3
parent ecb79e63534311e38951c65bf807bade4872fa3d

Roll base/allocator/partition_allocator/ 0e650666e..17c0ead1e0f8 (14 commits)

https://chromium.googlesource.com/chromium/src/base/allocator/partition_allocator.git/+log/0e650666e776..17c0ead1e0f8

PartitionAlloc needs to stop depending on chromium's //build in order to
be used in Skia. In particular, this means to stop depending on
`BUILDFLAG`. It will becomes `PA_BUILDFLAG`.

Bug: 41481467
Change-Id: Ib2221088f47e172499f6f8ffb13618c9ec28a41f
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/119550
Reviewed-by: Lei Zhang <thestig@chromium.org>
Auto-Submit: Arthur Sonzogni <arthursonzogni@chromium.org>
Commit-Queue: Arthur Sonzogni <arthursonzogni@chromium.org>

testing/allocator_shim_config.cpp

diff --git a/testing/allocator_shim_config.cpp b/testing/allocator_shim_config.cpp
index 5fb41e8..3d8fde1 100644
--- a/testing/allocator_shim_config.cpp
+++ b/testing/allocator_shim_config.cpp
@@ -12,14 +12,14 @@
 namespace pdfium {
 
 void ConfigurePartitionAllocShimPartitionForTest() {
-#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
-#if BUILDFLAG(ENABLE_BACKUP_REF_PTR_SUPPORT)
-#if BUILDFLAG(ENABLE_DANGLING_RAW_PTR_CHECKS)
+#if PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
+#if PA_BUILDFLAG(ENABLE_BACKUP_REF_PTR_SUPPORT)
+#if PA_BUILDFLAG(ENABLE_DANGLING_RAW_PTR_CHECKS)
   partition_alloc::SetDanglingRawPtrDetectedFn([](uintptr_t) { CHECK(0); });
-#endif  // BUILDFLAG(ENABLE_DANGLING_RAW_PTR_CHECKS)
+#endif  // PA_BUILDFLAG(ENABLE_DANGLING_RAW_PTR_CHECKS)
   allocator_shim::ConfigurePartitionsForTesting();
-#endif  // BUILDFLAG(ENABLE_BACKUP_REF_PTR_SUPPORT)
-#endif  // BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
+#endif  // PA_BUILDFLAG(ENABLE_BACKUP_REF_PTR_SUPPORT)
+#endif  // PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
 }
 
 }  // namespace pdfium