commit 0337b15ab8246b686c3cdc44c1bf72e76e51ca5f
author Lei Zhang <thestig@chromium.org> Fri Nov 12 22:45:11 2021 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Nov 12 22:45:11 2021 +0000
tree e841ce693a76b7168b5dcd0830459ba814a5e426
parent 9812bcf7ff2806de61e85dea1f502c7c82e6d827

Remove one form of CPDF_RenderContext::Render().

Just call the other form everywhere.

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

core/fpdfapi/render/cpdf_rendercontext.cpp

diff --git a/core/fpdfapi/render/cpdf_rendercontext.cpp b/core/fpdfapi/render/cpdf_rendercontext.cpp
index e0b4497..3e885f0 100644
--- a/core/fpdfapi/render/cpdf_rendercontext.cpp
+++ b/core/fpdfapi/render/cpdf_rendercontext.cpp
@@ -47,11 +47,6 @@
 }
 
 void CPDF_RenderContext::Render(CFX_RenderDevice* pDevice,
-                                const CPDF_RenderOptions* pOptions) {
-  Render(pDevice, nullptr, pOptions, nullptr);
-}
-
-void CPDF_RenderContext::Render(CFX_RenderDevice* pDevice,
                                 const CPDF_PageObject* pStopObj,
                                 const CPDF_RenderOptions* pOptions,
                                 const CFX_Matrix* pLastMatrix) {

core/fpdfapi/render/cpdf_rendercontext.h

diff --git a/core/fpdfapi/render/cpdf_rendercontext.h b/core/fpdfapi/render/cpdf_rendercontext.h
index 92eeade..fa26d2b 100644
--- a/core/fpdfapi/render/cpdf_rendercontext.h
+++ b/core/fpdfapi/render/cpdf_rendercontext.h
@@ -50,8 +50,6 @@
   void AppendLayer(CPDF_PageObjectHolder* pObjectHolder,
                    const CFX_Matrix& mtObject2Device);
 
-  void Render(CFX_RenderDevice* pDevice, const CPDF_RenderOptions* pOptions);
-
   void Render(CFX_RenderDevice* pDevice,
               const CPDF_PageObject* pStopObj,
               const CPDF_RenderOptions* pOptions,

core/fpdfapi/render/cpdf_rendertiling.cpp

diff --git a/core/fpdfapi/render/cpdf_rendertiling.cpp b/core/fpdfapi/render/cpdf_rendertiling.cpp
index cc80426..2e0fc88 100644
--- a/core/fpdfapi/render/cpdf_rendertiling.cpp
+++ b/core/fpdfapi/render/cpdf_rendertiling.cpp
@@ -56,7 +56,7 @@
 
   CPDF_RenderContext context(pDoc, nullptr, pCache);
   context.AppendLayer(pPatternForm, mtPattern2Bitmap);
-  context.Render(&bitmap_device, &options);
+  context.Render(&bitmap_device, nullptr, &options, nullptr);
 #if defined(_SKIA_SUPPORT_PATHS_)
   bitmap_device.Flush(true);
   pBitmap->UnPreMultiply();

core/fpdfdoc/cpdf_annot.cpp

diff --git a/core/fpdfdoc/cpdf_annot.cpp b/core/fpdfdoc/cpdf_annot.cpp
index 3738fb0..ab0cc4e 100644
--- a/core/fpdfdoc/cpdf_annot.cpp
+++ b/core/fpdfdoc/cpdf_annot.cpp
@@ -399,7 +399,7 @@
       pPage->GetDocument(), pPage->GetPageResources(),
       static_cast<CPDF_PageRenderCache*>(pPage->GetRenderCache()));
   context.AppendLayer(pForm, matrix);
-  context.Render(pDevice, nullptr);
+  context.Render(pDevice, nullptr, nullptr, nullptr);
   return true;
 }