commit 9a2a06d784c347395cabae4326b1d1db2cf2f362
author Lei Zhang <thestig@chromium.org> Fri Sep 18 17:18:29 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Fri Sep 18 17:18:29 2020 +0000
tree 2486938842ca8f4cf580b29a45367d5c64015939
parent 7257a3f99111c6376d659b0b554a0a93f5f63495

Remove RenderDeviceDriverIface::StartRendering() and EndRendering().

These methods can be specific to CFX_PSRenderer and do not need to be
plumbed through to RenderDeviceDriverIface. As is,
RenderDeviceDriverIface::EndRendering() has callers, but
RenderDeviceDriverIface::StartRendering) does not, which is a strange
imbalance.

Change-Id: Ia8d8b2aac2f739e1ce6ae293c1e18c98f8b4e397
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/73730
Reviewed-by: Hui Yingst <nigi@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

core/fxge/renderdevicedriver_iface.cpp

diff --git a/core/fxge/renderdevicedriver_iface.cpp b/core/fxge/renderdevicedriver_iface.cpp
index f3a0685..30e6c5d 100644
--- a/core/fxge/renderdevicedriver_iface.cpp
+++ b/core/fxge/renderdevicedriver_iface.cpp
@@ -12,12 +12,6 @@
 
 RenderDeviceDriverIface::~RenderDeviceDriverIface() = default;
 
-bool RenderDeviceDriverIface::StartRendering() {
-  return true;
-}
-
-void RenderDeviceDriverIface::EndRendering() {}
-
 bool RenderDeviceDriverIface::SetClip_PathStroke(
     const CFX_PathData* pPathData,
     const CFX_Matrix* pObject2Device,

core/fxge/renderdevicedriver_iface.h

diff --git a/core/fxge/renderdevicedriver_iface.h b/core/fxge/renderdevicedriver_iface.h
index 5245c43..b99cb3d 100644
--- a/core/fxge/renderdevicedriver_iface.h
+++ b/core/fxge/renderdevicedriver_iface.h
@@ -40,8 +40,6 @@
   virtual DeviceType GetDeviceType() const = 0;
   virtual int GetDeviceCaps(int caps_id) const = 0;
 
-  virtual bool StartRendering();
-  virtual void EndRendering();
   virtual void SaveState() = 0;
   virtual void RestoreState(bool bKeepSaved) = 0;
 

core/fxge/win32/fx_win32_print.cpp

diff --git a/core/fxge/win32/fx_win32_print.cpp b/core/fxge/win32/fx_win32_print.cpp
index 8ab7614..cd99464 100644
--- a/core/fxge/win32/fx_win32_print.cpp
+++ b/core/fxge/win32/fx_win32_print.cpp
@@ -389,7 +389,7 @@
 }
 
 CPSPrinterDriver::~CPSPrinterDriver() {
-  EndRendering();
+  m_PSRenderer.EndRendering();
 }
 
 DeviceType CPSPrinterDriver::GetDeviceType() const {
@@ -416,14 +416,6 @@
   }
 }
 
-bool CPSPrinterDriver::StartRendering() {
-  return m_PSRenderer.StartRendering();
-}
-
-void CPSPrinterDriver::EndRendering() {
-  m_PSRenderer.EndRendering();
-}
-
 void CPSPrinterDriver::SaveState() {
   m_PSRenderer.SaveState();
 }
@@ -532,9 +524,7 @@
   m_nBitsPerPixel = ::GetDeviceCaps(m_hDC, BITSPIXEL);
 }
 
-CTextOnlyPrinterDriver::~CTextOnlyPrinterDriver() {
-  EndRendering();
-}
+CTextOnlyPrinterDriver::~CTextOnlyPrinterDriver() = default;
 
 DeviceType CTextOnlyPrinterDriver::GetDeviceType() const {
   return DeviceType::kPrinter;

core/fxge/win32/win32_int.h

diff --git a/core/fxge/win32/win32_int.h b/core/fxge/win32/win32_int.h
index a2bffea..52127f1 100644
--- a/core/fxge/win32/win32_int.h
+++ b/core/fxge/win32/win32_int.h
@@ -233,8 +233,6 @@
   // RenderDeviceDriverIface:
   DeviceType GetDeviceType() const override;
   int GetDeviceCaps(int caps_id) const override;
-  bool StartRendering() override;
-  void EndRendering() override;
   void SaveState() override;
   void RestoreState(bool bKeepSaved) override;
   bool SetClip_PathFill(const CFX_PathData* pPathData,