Shorten PartitionAlloc includes.
PartitionAlloc is now declaring its include_dir. It means we can
simplify the path being used.
Note that we don't use them in PartitionAlloc yet. So, we can't yet move
where pdfium is fetched in.
Planned follow-ups:
1. Apply a similar update to PartitionAlloc's internal files.
2. (potentially) Move pdfium's PartitionAlloc into pdfium's third_party.
Bug:chromium:1467773
Change-Id: I698ab3e97f5b0506512cd3bfa776ea95381ebc90
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/112310
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Auto-Submit: Arthur Sonzogni <arthursonzogni@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
diff --git a/DEPS b/DEPS
index e0782a9..3311330 100644
--- a/DEPS
+++ b/DEPS
@@ -162,7 +162,7 @@
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling partition_allocator
# and whatever else without interference from each other.
- 'partition_allocator_revision': '2f4afa63f170deda326c8a1a25b6f8f2bfa9b8b8',
+ 'partition_allocator_revision': '6f90cb04abb81942abaab7b63d34c02882208172',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling pdfium_tests
# and whatever else without interference from each other.
diff --git a/core/fxcodec/BUILD.gn b/core/fxcodec/BUILD.gn
index 28f9915..3040dae 100644
--- a/core/fxcodec/BUILD.gn
+++ b/core/fxcodec/BUILD.gn
@@ -74,6 +74,7 @@
"../../:pdfium_noshorten_config",
]
include_dirs = []
+ public_deps = [ "../fxcrt:unowned_ptr" ]
deps = [
"../../third_party:lcms2",
"../../third_party:libopenjpeg2",
diff --git a/core/fxcrt/DEPS b/core/fxcrt/DEPS
index 5b61cbd..2e9180b 100644
--- a/core/fxcrt/DEPS
+++ b/core/fxcrt/DEPS
@@ -1,4 +1,4 @@
include_rules = [
- '+base/allocator',
+ '+partition_alloc',
'+third_party/icu',
]
diff --git a/core/fxcrt/fx_memory_pa.cpp b/core/fxcrt/fx_memory_pa.cpp
index 3c9f34b..a30fc1a 100644
--- a/core/fxcrt/fx_memory_pa.cpp
+++ b/core/fxcrt/fx_memory_pa.cpp
@@ -6,8 +6,8 @@
#include "core/fxcrt/fx_memory.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_alloc.h"
#include "core/fxcrt/fx_safe_types.h"
+#include "partition_alloc/partition_alloc.h"
#include "third_party/base/no_destructor.h"
#if !defined(PDF_USE_PARTITION_ALLOC)
diff --git a/core/fxcrt/fx_memory_unittest.cpp b/core/fxcrt/fx_memory_unittest.cpp
index db6d8f6..3196a25 100644
--- a/core/fxcrt/fx_memory_unittest.cpp
+++ b/core/fxcrt/fx_memory_unittest.cpp
@@ -11,7 +11,7 @@
#include "testing/gtest/include/gtest/gtest.h"
#if defined(PDF_USE_PARTITION_ALLOC)
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_address_space.h"
+#include "partition_alloc/partition_address_space.h"
#endif
namespace {
diff --git a/core/fxcrt/unowned_ptr.h b/core/fxcrt/unowned_ptr.h
index 38f5188..89ef955 100644
--- a/core/fxcrt/unowned_ptr.h
+++ b/core/fxcrt/unowned_ptr.h
@@ -39,7 +39,7 @@
#include "build/build_config.h"
#if defined(PDF_USE_PARTITION_ALLOC)
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_alloc_buildflags.h"
+#include "partition_alloc/partition_alloc_buildflags.h"
// Can only use base::raw_ptr<> impls that force nullptr initialization.
#if BUILDFLAG(ENABLE_BACKUP_REF_PTR_SUPPORT) || BUILDFLAG(USE_ASAN_UNOWNED_PTR)
@@ -52,7 +52,7 @@
#endif // PDF_USE_PARTITION_ALLOC
#if defined(UNOWNED_PTR_IS_BASE_RAW_PTR)
-#include "base/allocator/partition_allocator/src/partition_alloc/pointers/raw_ptr.h"
+#include "partition_alloc/pointers/raw_ptr.h"
template <typename T>
using UnownedPtr = raw_ptr<T>;
diff --git a/core/fxcrt/unowned_ptr_unittest.cpp b/core/fxcrt/unowned_ptr_unittest.cpp
index 626e84b..5290727 100644
--- a/core/fxcrt/unowned_ptr_unittest.cpp
+++ b/core/fxcrt/unowned_ptr_unittest.cpp
@@ -14,7 +14,7 @@
#include "third_party/base/containers/contains.h"
#if defined(PDF_USE_PARTITION_ALLOC)
-#include "base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_default_dispatch_to_partition_alloc.h"
+#include "partition_alloc/shim/allocator_shim_default_dispatch_to_partition_alloc.h"
#endif
namespace fxcrt {
diff --git a/testing/DEPS b/testing/DEPS
index d0dd4fb..bb5891e 100644
--- a/testing/DEPS
+++ b/testing/DEPS
@@ -1,8 +1,8 @@
include_rules = [
- '+base',
'+core',
'+fpdfsdk',
'+fxjs',
+ '+partition_alloc',
'+public',
'+v8',
'+xfa'
diff --git a/testing/allocator_shim_config.cpp b/testing/allocator_shim_config.cpp
index 97a4a20..416d82f 100644
--- a/testing/allocator_shim_config.cpp
+++ b/testing/allocator_shim_config.cpp
@@ -4,8 +4,8 @@
#include "testing/allocator_shim_config.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/partition_alloc_buildflags.h"
-#include "base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim.h"
+#include "partition_alloc/partition_alloc_buildflags.h"
+#include "partition_alloc/shim/allocator_shim.h"
namespace pdfium {
