commit 21b96ced829c61c68ee52dad872cb24b285c4883
author Lei Zhang <thestig@chromium.org> Mon Oct 09 21:55:52 2023 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Oct 09 21:55:52 2023 +0000
tree 139870645760aeb2fe1a76d15864c142f08943a0
parent 7c6c8fffb203e313f6964bf5d03af087c9906e8a

Remove CPDF_PageModule::ClearStockFont()

There is no need for this pass-through, as CPDF_DocPageData can call
CPDF_FontGlobals directly.

Change-Id: I6c1841d96c68a88e696effa0aed8325ee69e8eb5
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/112416
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

core/fpdfapi/page/cpdf_docpagedata.cpp

diff --git a/core/fpdfapi/page/cpdf_docpagedata.cpp b/core/fpdfapi/page/cpdf_docpagedata.cpp
index 001f2df..cfe78fe 100644
--- a/core/fpdfapi/page/cpdf_docpagedata.cpp
+++ b/core/fpdfapi/page/cpdf_docpagedata.cpp
@@ -14,11 +14,11 @@
 
 #include "build/build_config.h"
 #include "constants/font_encodings.h"
+#include "core/fpdfapi/font/cpdf_fontglobals.h"
 #include "core/fpdfapi/font/cpdf_type1font.h"
 #include "core/fpdfapi/page/cpdf_form.h"
 #include "core/fpdfapi/page/cpdf_iccprofile.h"
 #include "core/fpdfapi/page/cpdf_image.h"
-#include "core/fpdfapi/page/cpdf_pagemodule.h"
 #include "core/fpdfapi/page/cpdf_pattern.h"
 #include "core/fpdfapi/page/cpdf_shadingpattern.h"
 #include "core/fpdfapi/page/cpdf_tilingpattern.h"
@@ -189,7 +189,7 @@
 }
 
 void CPDF_DocPageData::ClearStockFont() {
-  CPDF_PageModule::GetInstance()->ClearStockFont(GetDocument());
+  CPDF_FontGlobals::GetInstance()->Clear(GetDocument());
 }
 
 RetainPtr<CPDF_Font> CPDF_DocPageData::GetFont(

core/fpdfapi/page/cpdf_pagemodule.cpp

diff --git a/core/fpdfapi/page/cpdf_pagemodule.cpp b/core/fpdfapi/page/cpdf_pagemodule.cpp
index 09cf812e..82508a7 100644
--- a/core/fpdfapi/page/cpdf_pagemodule.cpp
+++ b/core/fpdfapi/page/cpdf_pagemodule.cpp
@@ -45,7 +45,3 @@
   CPDF_FontGlobals::Destroy();
   CPDF_ColorSpace::DestroyGlobals();
 }
-
-void CPDF_PageModule::ClearStockFont(CPDF_Document* pDoc) {
-  CPDF_FontGlobals::GetInstance()->Clear(pDoc);
-}

core/fpdfapi/page/cpdf_pagemodule.h

diff --git a/core/fpdfapi/page/cpdf_pagemodule.h b/core/fpdfapi/page/cpdf_pagemodule.h
index a040413..feb1e97 100644
--- a/core/fpdfapi/page/cpdf_pagemodule.h
+++ b/core/fpdfapi/page/cpdf_pagemodule.h
@@ -7,8 +7,6 @@
 #ifndef CORE_FPDFAPI_PAGE_CPDF_PAGEMODULE_H_
 #define CORE_FPDFAPI_PAGE_CPDF_PAGEMODULE_H_
 
-class CPDF_Document;
-
 class CPDF_PageModule {
  public:
   // Per-process singleton managed by callers.
@@ -16,8 +14,6 @@
   static void Destroy();
   static CPDF_PageModule* GetInstance();
 
-  void ClearStockFont(CPDF_Document* pDoc);
-
  private:
   CPDF_PageModule();
   ~CPDF_PageModule();