commit c9ab9299a9a90280092761bf76998c0e38000ac7
author Lei Zhang <thestig@chromium.org> Tue Oct 12 20:19:38 2021 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Oct 12 20:19:38 2021 +0000
tree 5c6862257ae5b5059a3968988d7ec55c92ec7092
parent 3331891d160e942effadaec0bd66962e303ec98d

Make CFX_PSRenderer::{Start,End}Rendering() private.

- StartRendering() has no external callers.
- EndRendering() is only caller immediately before destruction.
  Internalize this.

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

core/fxge/win32/cfx_psrenderer.cpp

diff --git a/core/fxge/win32/cfx_psrenderer.cpp b/core/fxge/win32/cfx_psrenderer.cpp
index 5228b2c..e0f6424 100644
--- a/core/fxge/win32/cfx_psrenderer.cpp
+++ b/core/fxge/win32/cfx_psrenderer.cpp
@@ -204,7 +204,9 @@
   DCHECK(m_pFontTracker);
 }
 
-CFX_PSRenderer::~CFX_PSRenderer() = default;
+CFX_PSRenderer::~CFX_PSRenderer() {
+  EndRendering();
+}
 
 void CFX_PSRenderer::Init(const RetainPtr<IFX_RetainableWriteStream>& pStream,
                           RenderingLevel level,

core/fxge/win32/cfx_psrenderer.h

diff --git a/core/fxge/win32/cfx_psrenderer.h b/core/fxge/win32/cfx_psrenderer.h
index 69e0564..527532c 100644
--- a/core/fxge/win32/cfx_psrenderer.h
+++ b/core/fxge/win32/cfx_psrenderer.h
@@ -72,8 +72,6 @@
             RenderingLevel level,
             int width,
             int height);
-  void StartRendering();
-  void EndRendering();
   void SaveState();
   void RestoreState(bool bKeepSaved);
   void SetClip_PathFill(const CFX_Path* pPath,
@@ -124,6 +122,8 @@
  private:
   struct Glyph;
 
+  void StartRendering();
+  void EndRendering();
   void OutputPath(const CFX_Path* pPath, const CFX_Matrix* pObject2Device);
   void SetGraphState(const CFX_GraphStateData* pGraphState);
   void SetColor(uint32_t color);

core/fxge/win32/cps_printer_driver.cpp

diff --git a/core/fxge/win32/cps_printer_driver.cpp b/core/fxge/win32/cps_printer_driver.cpp
index 2df49a7..ab6fe06 100644
--- a/core/fxge/win32/cps_printer_driver.cpp
+++ b/core/fxge/win32/cps_printer_driver.cpp
@@ -88,9 +88,7 @@
   ::DeleteObject(hRgn);
 }
 
-CPSPrinterDriver::~CPSPrinterDriver() {
-  m_PSRenderer.EndRendering();
-}
+CPSPrinterDriver::~CPSPrinterDriver() = default;
 
 DeviceType CPSPrinterDriver::GetDeviceType() const {
   return DeviceType::kPrinter;