Rename FXMEM_InitializePartitionAlloc() to FX_InitializeMemoryAllocators()
Begin to remove the notion of always having PA from fx_memory.h.
- Remove FXMEM_ to keep that prefix solely for the third-party C shim.
Change-Id: I43dc4f8f5bcf01da96ce61533abbe44309b9662e
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/96551
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
diff --git a/core/fxcrt/fx_memory.cpp b/core/fxcrt/fx_memory.cpp
index ab1a774..cb93eae 100644
--- a/core/fxcrt/fx_memory.cpp
+++ b/core/fxcrt/fx_memory.cpp
@@ -43,7 +43,7 @@
} // namespace
-void FXMEM_InitializePartitionAlloc() {
+void FX_InitializeMemoryAllocators() {
static bool s_partition_allocators_initialized = false;
if (!s_partition_allocators_initialized) {
pdfium::base::PartitionAllocGlobalInit(FX_OutOfMemoryTerminate);
diff --git a/core/fxcrt/fx_memory.h b/core/fxcrt/fx_memory.h
index 4d298c7..f110a14 100644
--- a/core/fxcrt/fx_memory.h
+++ b/core/fxcrt/fx_memory.h
@@ -24,7 +24,7 @@
#include "third_party/base/compiler_specific.h"
-void FXMEM_InitializePartitionAlloc();
+void FX_InitializeMemoryAllocators();
NOINLINE void FX_OutOfMemoryTerminate(size_t size);
// General Partition Allocators.
diff --git a/fpdfsdk/fpdf_view.cpp b/fpdfsdk/fpdf_view.cpp
index 89b04d5..0ba7f31a 100644
--- a/fpdfsdk/fpdf_view.cpp
+++ b/fpdfsdk/fpdf_view.cpp
@@ -181,7 +181,7 @@
if (g_bLibraryInitialized)
return;
- FXMEM_InitializePartitionAlloc();
+ FX_InitializeMemoryAllocators();
CFX_GEModule::Create(config ? config->m_pUserFontPaths : nullptr);
CPDF_PageModule::Create();
diff --git a/testing/embedder_test_main.cpp b/testing/embedder_test_main.cpp
index 0698205..de680f1 100644
--- a/testing/embedder_test_main.cpp
+++ b/testing/embedder_test_main.cpp
@@ -16,7 +16,7 @@
// testing environment which needs the executable path in order to
// find the external V8 binary data files.
int main(int argc, char** argv) {
- FXMEM_InitializePartitionAlloc();
+ FX_InitializeMemoryAllocators();
#ifdef PDF_ENABLE_V8
// The env will be deleted by gtest.
diff --git a/testing/image_diff/image_diff.cpp b/testing/image_diff/image_diff.cpp
index f678b74..0153f75 100644
--- a/testing/image_diff/image_diff.cpp
+++ b/testing/image_diff/image_diff.cpp
@@ -366,7 +366,7 @@
}
int main(int argc, const char* argv[]) {
- FXMEM_InitializePartitionAlloc();
+ FX_InitializeMemoryAllocators();
bool histograms = false;
bool produce_diff_image = false;
diff --git a/testing/unit_test_main.cpp b/testing/unit_test_main.cpp
index fd2ea9b..de4642e 100644
--- a/testing/unit_test_main.cpp
+++ b/testing/unit_test_main.cpp
@@ -17,7 +17,7 @@
// Can't use gtest-provided main since we need to initialize partition
// alloc before invoking any test, and add test environments.
int main(int argc, char** argv) {
- FXMEM_InitializePartitionAlloc();
+ FX_InitializeMemoryAllocators();
// PDF test environment will be deleted by gtest.
AddGlobalTestEnvironment(new PDFTestEnvironment());