Remove CPDF_ModuleMgr.
Call directly into CPDF_PageModule instead.
Change-Id: I434e8146a74c9b40e44c2fdda5624df9dcee867e
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/58552
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/BUILD.gn b/BUILD.gn
index 91a2ccb..bf20f6e 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -149,7 +149,6 @@
deps = [
"constants",
- "core/fpdfapi",
"core/fpdfapi/page",
"core/fpdfapi/parser",
"core/fpdfdoc",
diff --git a/core/fpdfapi/BUILD.gn b/core/fpdfapi/BUILD.gn
deleted file mode 100644
index 331f100..0000000
--- a/core/fpdfapi/BUILD.gn
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2018 The PDFium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/config/jumbo.gni")
-import("../../pdfium.gni")
-
-jumbo_source_set("fpdfapi") {
- sources = [
- "cpdf_modulemgr.cpp",
- "cpdf_modulemgr.h",
- ]
- configs += [ "../../:pdfium_core_config" ]
- deps = [
- "../fxcodec",
- "page",
- ]
- visibility = [ "../../*" ]
-}
diff --git a/core/fpdfapi/cpdf_modulemgr.cpp b/core/fpdfapi/cpdf_modulemgr.cpp
deleted file mode 100644
index b238719..0000000
--- a/core/fpdfapi/cpdf_modulemgr.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "core/fpdfapi/cpdf_modulemgr.h"
-
-#include "core/fpdfapi/page/cpdf_pagemodule.h"
-
-namespace {
-
-bool g_bModuleMgrCreated = false;
-
-} // namespace
-
-// static
-void CPDF_ModuleMgr::Create() {
- ASSERT(!g_bModuleMgrCreated);
- CPDF_PageModule::Create();
- g_bModuleMgrCreated = true;
-}
-
-// static
-void CPDF_ModuleMgr::Destroy() {
- ASSERT(g_bModuleMgrCreated);
- CPDF_PageModule::Destroy();
- g_bModuleMgrCreated = false;
-}
diff --git a/core/fpdfapi/cpdf_modulemgr.h b/core/fpdfapi/cpdf_modulemgr.h
deleted file mode 100644
index 8cc713b..0000000
--- a/core/fpdfapi/cpdf_modulemgr.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2016 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef CORE_FPDFAPI_CPDF_MODULEMGR_H_
-#define CORE_FPDFAPI_CPDF_MODULEMGR_H_
-
-class CPDF_ModuleMgr {
- public:
- static void Create();
- static void Destroy();
-
- private:
- CPDF_ModuleMgr() = delete;
- ~CPDF_ModuleMgr() = delete;
-};
-
-#endif // CORE_FPDFAPI_CPDF_MODULEMGR_H_
diff --git a/core/fpdfapi/edit/BUILD.gn b/core/fpdfapi/edit/BUILD.gn
index 25dd663..f4d70c1 100644
--- a/core/fpdfapi/edit/BUILD.gn
+++ b/core/fpdfapi/edit/BUILD.gn
@@ -38,7 +38,6 @@
]
deps = [
":edit",
- "../",
"../../fxge",
"../font",
"../page",
diff --git a/core/fpdfapi/edit/cpdf_pagecontentgenerator_unittest.cpp b/core/fpdfapi/edit/cpdf_pagecontentgenerator_unittest.cpp
index a2ee17a..cf1194c 100644
--- a/core/fpdfapi/edit/cpdf_pagecontentgenerator_unittest.cpp
+++ b/core/fpdfapi/edit/cpdf_pagecontentgenerator_unittest.cpp
@@ -7,12 +7,12 @@
#include <memory>
#include <utility>
-#include "core/fpdfapi/cpdf_modulemgr.h"
#include "core/fpdfapi/font/cpdf_font.h"
#include "core/fpdfapi/page/cpdf_colorspace.h"
#include "core/fpdfapi/page/cpdf_docpagedata.h"
#include "core/fpdfapi/page/cpdf_form.h"
#include "core/fpdfapi/page/cpdf_page.h"
+#include "core/fpdfapi/page/cpdf_pagemodule.h"
#include "core/fpdfapi/page/cpdf_pathobject.h"
#include "core/fpdfapi/page/cpdf_textobject.h"
#include "core/fpdfapi/parser/cpdf_dictionary.h"
@@ -28,8 +28,8 @@
class CPDF_PageContentGeneratorTest : public testing::Test {
protected:
- void SetUp() override { CPDF_ModuleMgr::Create(); }
- void TearDown() override { CPDF_ModuleMgr::Destroy(); }
+ void SetUp() override { CPDF_PageModule::Create(); }
+ void TearDown() override { CPDF_PageModule::Destroy(); }
void TestProcessPath(CPDF_PageContentGenerator* pGen,
std::ostringstream* buf,
diff --git a/core/fpdfapi/font/BUILD.gn b/core/fpdfapi/font/BUILD.gn
index a649460..673f342 100644
--- a/core/fpdfapi/font/BUILD.gn
+++ b/core/fpdfapi/font/BUILD.gn
@@ -62,7 +62,6 @@
]
deps = [
":font",
- "../../fpdfapi",
"../page",
"../parser",
"../render",
diff --git a/core/fpdfapi/font/cpdf_cidfont_unittest.cpp b/core/fpdfapi/font/cpdf_cidfont_unittest.cpp
index f8d3680..225ea3a 100644
--- a/core/fpdfapi/font/cpdf_cidfont_unittest.cpp
+++ b/core/fpdfapi/font/cpdf_cidfont_unittest.cpp
@@ -6,8 +6,8 @@
#include <utility>
-#include "core/fpdfapi/cpdf_modulemgr.h"
#include "core/fpdfapi/page/cpdf_docpagedata.h"
+#include "core/fpdfapi/page/cpdf_pagemodule.h"
#include "core/fpdfapi/parser/cpdf_array.h"
#include "core/fpdfapi/parser/cpdf_dictionary.h"
#include "core/fpdfapi/parser/cpdf_document.h"
@@ -17,8 +17,8 @@
class CPDF_CIDFontTest : public testing::Test {
protected:
- void SetUp() override { CPDF_ModuleMgr::Create(); }
- void TearDown() override { CPDF_ModuleMgr::Destroy(); }
+ void SetUp() override { CPDF_PageModule::Create(); }
+ void TearDown() override { CPDF_PageModule::Destroy(); }
};
TEST_F(CPDF_CIDFontTest, BUG_920636) {
diff --git a/core/fpdfapi/parser/BUILD.gn b/core/fpdfapi/parser/BUILD.gn
index ffcf909..4c2da7a 100644
--- a/core/fpdfapi/parser/BUILD.gn
+++ b/core/fpdfapi/parser/BUILD.gn
@@ -118,7 +118,6 @@
]
deps = [
":parser",
- "../",
"../../../constants",
"../page",
"../render",
diff --git a/core/fpdfapi/parser/cpdf_document_unittest.cpp b/core/fpdfapi/parser/cpdf_document_unittest.cpp
index 84a16c3..1c52e51 100644
--- a/core/fpdfapi/parser/cpdf_document_unittest.cpp
+++ b/core/fpdfapi/parser/cpdf_document_unittest.cpp
@@ -7,8 +7,8 @@
#include <memory>
#include <utility>
-#include "core/fpdfapi/cpdf_modulemgr.h"
#include "core/fpdfapi/page/cpdf_docpagedata.h"
+#include "core/fpdfapi/page/cpdf_pagemodule.h"
#include "core/fpdfapi/parser/cpdf_array.h"
#include "core/fpdfapi/parser/cpdf_boolean.h"
#include "core/fpdfapi/parser/cpdf_dictionary.h"
@@ -163,8 +163,8 @@
class cpdf_document_test : public testing::Test {
public:
- void SetUp() override { CPDF_ModuleMgr::Create(); }
- void TearDown() override { CPDF_ModuleMgr::Destroy(); }
+ void SetUp() override { CPDF_PageModule::Create(); }
+ void TearDown() override { CPDF_PageModule::Destroy(); }
};
TEST_F(cpdf_document_test, GetPages) {
diff --git a/core/fpdfapi/parser/cpdf_hint_tables_unittest.cpp b/core/fpdfapi/parser/cpdf_hint_tables_unittest.cpp
index fda209f..27592ba 100644
--- a/core/fpdfapi/parser/cpdf_hint_tables_unittest.cpp
+++ b/core/fpdfapi/parser/cpdf_hint_tables_unittest.cpp
@@ -8,7 +8,7 @@
#include <string>
#include <utility>
-#include "core/fpdfapi/cpdf_modulemgr.h"
+#include "core/fpdfapi/page/cpdf_pagemodule.h"
#include "core/fpdfapi/parser/cpdf_data_avail.h"
#include "core/fpdfapi/parser/cpdf_dictionary.h"
#include "core/fpdfapi/parser/cpdf_linearized_header.h"
@@ -63,10 +63,10 @@
public:
CPDF_HintTablesTest() {
// Needs for encoding Hint table stream.
- CPDF_ModuleMgr::Create();
+ CPDF_PageModule::Create();
}
- ~CPDF_HintTablesTest() override { CPDF_ModuleMgr::Destroy(); }
+ ~CPDF_HintTablesTest() override { CPDF_PageModule::Destroy(); }
};
TEST_F(CPDF_HintTablesTest, Load) {
diff --git a/core/fpdfdoc/BUILD.gn b/core/fpdfdoc/BUILD.gn
index ace41a6..c0478aa 100644
--- a/core/fpdfdoc/BUILD.gn
+++ b/core/fpdfdoc/BUILD.gn
@@ -88,7 +88,6 @@
configs += [ "../../:pdfium_core_config" ]
deps = [
"../../constants",
- "../fpdfapi",
"../fpdfapi/font",
"../fpdfapi/page",
"../fpdfapi/parser",
diff --git a/core/fpdfdoc/cba_fontmap.cpp b/core/fpdfdoc/cba_fontmap.cpp
index 974d765..141c832 100644
--- a/core/fpdfdoc/cba_fontmap.cpp
+++ b/core/fpdfdoc/cba_fontmap.cpp
@@ -10,7 +10,6 @@
#include <utility>
#include "constants/annotation_common.h"
-#include "core/fpdfapi/cpdf_modulemgr.h"
#include "core/fpdfapi/font/cpdf_font.h"
#include "core/fpdfapi/font/cpdf_fontencoding.h"
#include "core/fpdfapi/page/cpdf_docpagedata.h"
diff --git a/fpdfsdk/BUILD.gn b/fpdfsdk/BUILD.gn
index 9d9993b..a8c7ec4 100644
--- a/fpdfsdk/BUILD.gn
+++ b/fpdfsdk/BUILD.gn
@@ -76,7 +76,6 @@
"../:pdfium_public_headers",
"../constants",
"../core/fdrm",
- "../core/fpdfapi",
"../core/fpdfapi/edit",
"../core/fpdfapi/font",
"../core/fpdfapi/page",
@@ -127,7 +126,6 @@
deps = [
":fpdfsdk",
"../:pdfium_public_headers",
- "../core/fpdfapi",
"../core/fpdfapi/page",
"../core/fpdfapi/parser",
"../core/fpdfapi/render",
diff --git a/fpdfsdk/cpdfsdk_helpers.cpp b/fpdfsdk/cpdfsdk_helpers.cpp
index bafac5c..2d7cba0 100644
--- a/fpdfsdk/cpdfsdk_helpers.cpp
+++ b/fpdfsdk/cpdfsdk_helpers.cpp
@@ -9,7 +9,6 @@
#include "build/build_config.h"
#include "constants/form_fields.h"
#include "constants/stream_dict_common.h"
-#include "core/fpdfapi/cpdf_modulemgr.h"
#include "core/fpdfapi/page/cpdf_page.h"
#include "core/fpdfapi/parser/cpdf_array.h"
#include "core/fpdfapi/parser/cpdf_dictionary.h"
diff --git a/fpdfsdk/fpdf_catalog_unittest.cpp b/fpdfsdk/fpdf_catalog_unittest.cpp
index 1b12506..68655da 100644
--- a/fpdfsdk/fpdf_catalog_unittest.cpp
+++ b/fpdfsdk/fpdf_catalog_unittest.cpp
@@ -6,8 +6,8 @@
#include <memory>
-#include "core/fpdfapi/cpdf_modulemgr.h"
#include "core/fpdfapi/page/cpdf_docpagedata.h"
+#include "core/fpdfapi/page/cpdf_pagemodule.h"
#include "core/fpdfapi/parser/cpdf_dictionary.h"
#include "core/fpdfapi/parser/cpdf_document.h"
#include "core/fpdfapi/parser/cpdf_number.h"
@@ -31,7 +31,7 @@
class PDFCatalogTest : public testing::Test {
public:
void SetUp() override {
- CPDF_ModuleMgr::Create();
+ CPDF_PageModule::Create();
auto pTestDoc = pdfium::MakeUnique<CPDF_TestDocument>();
m_pDoc.reset(FPDFDocumentFromCPDFDocument(pTestDoc.release()));
m_pRootObj = pdfium::MakeRetain<CPDF_Dictionary>();
@@ -39,7 +39,7 @@
void TearDown() override {
m_pDoc.reset();
- CPDF_ModuleMgr::Destroy();
+ CPDF_PageModule::Destroy();
}
protected:
diff --git a/fpdfsdk/fpdf_doc_unittest.cpp b/fpdfsdk/fpdf_doc_unittest.cpp
index 032f95f..2beadd4 100644
--- a/fpdfsdk/fpdf_doc_unittest.cpp
+++ b/fpdfsdk/fpdf_doc_unittest.cpp
@@ -7,8 +7,8 @@
#include <memory>
#include <vector>
-#include "core/fpdfapi/cpdf_modulemgr.h"
#include "core/fpdfapi/page/cpdf_docpagedata.h"
+#include "core/fpdfapi/page/cpdf_pagemodule.h"
#include "core/fpdfapi/parser/cpdf_array.h"
#include "core/fpdfapi/parser/cpdf_dictionary.h"
#include "core/fpdfapi/parser/cpdf_document.h"
@@ -44,7 +44,7 @@
};
void SetUp() override {
- CPDF_ModuleMgr::Create();
+ CPDF_PageModule::Create();
auto pTestDoc = pdfium::MakeUnique<CPDF_TestDocument>();
m_pIndirectObjs = pTestDoc->GetHolder();
m_pRootObj.Reset(m_pIndirectObjs->NewIndirect<CPDF_Dictionary>());
@@ -56,7 +56,7 @@
m_pRootObj = nullptr;
m_pIndirectObjs = nullptr;
m_pDoc.reset();
- CPDF_ModuleMgr::Destroy();
+ CPDF_PageModule::Destroy();
}
std::vector<DictObjInfo> CreateDictObjs(int num) {
diff --git a/fpdfsdk/fpdf_edit_unittest.cpp b/fpdfsdk/fpdf_edit_unittest.cpp
index 1fcd93d..6aa24f4 100644
--- a/fpdfsdk/fpdf_edit_unittest.cpp
+++ b/fpdfsdk/fpdf_edit_unittest.cpp
@@ -4,12 +4,12 @@
#include "public/fpdf_edit.h"
-#include "core/fpdfapi/cpdf_modulemgr.h"
+#include "core/fpdfapi/page/cpdf_pagemodule.h"
#include "testing/gtest/include/gtest/gtest.h"
class PDFEditTest : public testing::Test {
- void SetUp() override { CPDF_ModuleMgr::Create(); }
- void TearDown() override { CPDF_ModuleMgr::Destroy(); }
+ void SetUp() override { CPDF_PageModule::Create(); }
+ void TearDown() override { CPDF_PageModule::Destroy(); }
};
TEST_F(PDFEditTest, LineJoin) {
diff --git a/fpdfsdk/fpdf_editimg.cpp b/fpdfsdk/fpdf_editimg.cpp
index e253186..fc12b2b 100644
--- a/fpdfsdk/fpdf_editimg.cpp
+++ b/fpdfsdk/fpdf_editimg.cpp
@@ -8,7 +8,6 @@
#include <utility>
-#include "core/fpdfapi/cpdf_modulemgr.h"
#include "core/fpdfapi/page/cpdf_dibbase.h"
#include "core/fpdfapi/page/cpdf_image.h"
#include "core/fpdfapi/page/cpdf_imageobject.h"
diff --git a/fpdfsdk/fpdf_editimg_unittest.cpp b/fpdfsdk/fpdf_editimg_unittest.cpp
index 81a4877..89fb9c5 100644
--- a/fpdfsdk/fpdf_editimg_unittest.cpp
+++ b/fpdfsdk/fpdf_editimg_unittest.cpp
@@ -4,13 +4,13 @@
#include "public/fpdf_edit.h"
-#include "core/fpdfapi/cpdf_modulemgr.h"
+#include "core/fpdfapi/page/cpdf_pagemodule.h"
#include "public/cpp/fpdf_scopers.h"
#include "testing/gtest/include/gtest/gtest.h"
class PDFEditImgTest : public testing::Test {
- void SetUp() override { CPDF_ModuleMgr::Create(); }
- void TearDown() override { CPDF_ModuleMgr::Destroy(); }
+ void SetUp() override { CPDF_PageModule::Create(); }
+ void TearDown() override { CPDF_PageModule::Destroy(); }
};
TEST_F(PDFEditImgTest, InsertObjectWithInvalidPage) {
diff --git a/fpdfsdk/fpdf_edittext.cpp b/fpdfsdk/fpdf_edittext.cpp
index 1cc703c..3d3ba26 100644
--- a/fpdfsdk/fpdf_edittext.cpp
+++ b/fpdfsdk/fpdf_edittext.cpp
@@ -9,7 +9,6 @@
#include <utility>
#include <vector>
-#include "core/fpdfapi/cpdf_modulemgr.h"
#include "core/fpdfapi/font/cpdf_font.h"
#include "core/fpdfapi/font/cpdf_type1font.h"
#include "core/fpdfapi/page/cpdf_docpagedata.h"
diff --git a/fpdfsdk/fpdf_ext.cpp b/fpdfsdk/fpdf_ext.cpp
index acb40de..4721a79 100644
--- a/fpdfsdk/fpdf_ext.cpp
+++ b/fpdfsdk/fpdf_ext.cpp
@@ -6,7 +6,6 @@
#include "public/fpdf_ext.h"
-#include "core/fpdfapi/cpdf_modulemgr.h"
#include "core/fpdfapi/parser/cpdf_dictionary.h"
#include "core/fpdfapi/parser/cpdf_document.h"
#include "core/fpdfdoc/cpdf_interactiveform.h"
diff --git a/fpdfsdk/fpdf_view.cpp b/fpdfsdk/fpdf_view.cpp
index 5539fbc..b87fcc1 100644
--- a/fpdfsdk/fpdf_view.cpp
+++ b/fpdfsdk/fpdf_view.cpp
@@ -11,10 +11,10 @@
#include <vector>
#include "build/build_config.h"
-#include "core/fpdfapi/cpdf_modulemgr.h"
#include "core/fpdfapi/page/cpdf_docpagedata.h"
#include "core/fpdfapi/page/cpdf_occontext.h"
#include "core/fpdfapi/page/cpdf_page.h"
+#include "core/fpdfapi/page/cpdf_pagemodule.h"
#include "core/fpdfapi/parser/cpdf_array.h"
#include "core/fpdfapi/parser/cpdf_dictionary.h"
#include "core/fpdfapi/parser/cpdf_document.h"
@@ -168,7 +168,7 @@
FXMEM_InitializePartitionAlloc();
CFX_GEModule::Create(config ? config->m_pUserFontPaths : nullptr);
- CPDF_ModuleMgr::Create();
+ CPDF_PageModule::Create();
#ifdef PDF_ENABLE_XFA
BC_Library_Init();
@@ -187,7 +187,7 @@
BC_Library_Destroy();
#endif // PDF_ENABLE_XFA
- CPDF_ModuleMgr::Destroy();
+ CPDF_PageModule::Destroy();
CFX_GEModule::Destroy();
IJS_Runtime::Destroy();
diff --git a/xfa/fgas/BUILD.gn b/xfa/fgas/BUILD.gn
index f11c990..e1d0a13 100644
--- a/xfa/fgas/BUILD.gn
+++ b/xfa/fgas/BUILD.gn
@@ -55,7 +55,7 @@
]
deps = [
":fgas",
- "../../core/fpdfapi",
+ "../../core/fpdfapi/page",
"../fxfa/parser",
]
pdfium_root_dir = "../../"
diff --git a/xfa/fgas/crt/cfgas_stringformatter_unittest.cpp b/xfa/fgas/crt/cfgas_stringformatter_unittest.cpp
index f9bd450..8a9e60c 100644
--- a/xfa/fgas/crt/cfgas_stringformatter_unittest.cpp
+++ b/xfa/fgas/crt/cfgas_stringformatter_unittest.cpp
@@ -11,7 +11,7 @@
#include <memory>
#include "build/build_config.h"
-#include "core/fpdfapi/cpdf_modulemgr.h"
+#include "core/fpdfapi/page/cpdf_pagemodule.h"
#include "testing/fx_string_testhelpers.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/base/ptr_util.h"
@@ -21,10 +21,10 @@
public:
CFGAS_StringFormatterTest() {
SetTZ("UTC");
- CPDF_ModuleMgr::Create();
+ CPDF_PageModule::Create();
}
- ~CFGAS_StringFormatterTest() override { CPDF_ModuleMgr::Destroy(); }
+ ~CFGAS_StringFormatterTest() override { CPDF_PageModule::Destroy(); }
void TearDown() override {
fmt_.reset();
