commit 9669d8099ada05398bbf5d6a138c59b44f6eed76
author Tom Sepez <tsepez@chromium.org> Thu Oct 28 21:29:07 2021 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Oct 28 21:29:07 2021 +0000
tree 0c03d8ac8e4124e2b1d198511096b66ea15eff5f
parent 085979a99379de4ddc5a678b72997ee251e5857c

Remove null matrix from short form of CPDF_RenderContext::Render().

Change-Id: I9dd3126261dcd198e23325796bd05dd281436990
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/86513
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: 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 14facbd..e0b4497 100644
--- a/core/fpdfapi/render/cpdf_rendercontext.cpp
+++ b/core/fpdfapi/render/cpdf_rendercontext.cpp
@@ -47,9 +47,8 @@
 }
 
 void CPDF_RenderContext::Render(CFX_RenderDevice* pDevice,
-                                const CPDF_RenderOptions* pOptions,
-                                const CFX_Matrix* pLastMatrix) {
-  Render(pDevice, nullptr, pOptions, pLastMatrix);
+                                const CPDF_RenderOptions* pOptions) {
+  Render(pDevice, nullptr, pOptions, nullptr);
 }
 
 void CPDF_RenderContext::Render(CFX_RenderDevice* pDevice,

core/fpdfapi/render/cpdf_rendercontext.h

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

core/fpdfapi/render/cpdf_rendertiling.cpp

diff --git a/core/fpdfapi/render/cpdf_rendertiling.cpp b/core/fpdfapi/render/cpdf_rendertiling.cpp
index 6ccd590..cc80426 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, nullptr);
+  context.Render(&bitmap_device, &options);
 #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 603b12f..3738fb0 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, nullptr);
+  context.Render(pDevice, nullptr);
   return true;
 }