commit 0659d7c51bd0d88c3e9320ab4a3e3772dd59ce87
author Lei Zhang <thestig@chromium.org> Tue Aug 27 17:10:16 2024 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Aug 27 17:10:16 2024 +0000
tree ca0bc14bff594a9f206f938cd9303373cf26a8a8
parent 9da4078d61447fa0bcd9ec224f5a2d3b6e06f2e8

Remove CPDF_RenderStatus::m_curBlend

The only remaining setter for this member variable is CPDF_RenderStatus
itself. So the value is the same in every instance.

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

core/fpdfapi/render/cpdf_renderstatus.cpp

diff --git a/core/fpdfapi/render/cpdf_renderstatus.cpp b/core/fpdfapi/render/cpdf_renderstatus.cpp
index f493741..5369dd9 100644
--- a/core/fpdfapi/render/cpdf_renderstatus.cpp
+++ b/core/fpdfapi/render/cpdf_renderstatus.cpp
@@ -399,7 +399,6 @@
   status.SetFormResource(std::move(pResources));
   status.SetInGroup(m_bInGroup);
   status.Initialize(this, &pFormObj->graphic_states());
-  status.m_curBlend = m_curBlend;
   {
     CFX_RenderDevice::StateRestorer restorer(m_pDevice);
     status.RenderObjectList(pFormObj->form(), matrix);
@@ -439,7 +438,7 @@
       path_obj->graph_state().GetObject(), fill_argb, stroke_argb,
       GetFillOptionsForDrawPathWithBlend(options, path_obj, fill_type, stroke,
                                          m_pType3Char),
-      m_curBlend);
+      BlendMode::kNormal);
 }
 
 RetainPtr<CPDF_TransferFunc> CPDF_RenderStatus::GetTransferFunc(
@@ -1230,8 +1229,9 @@
 bool CPDF_RenderStatus::ProcessImage(CPDF_ImageObject* pImageObj,
                                      const CFX_Matrix& mtObj2Device) {
   CPDF_ImageRenderer render(this);
-  if (render.Start(pImageObj, mtObj2Device, m_bStdCS, m_curBlend))
+  if (render.Start(pImageObj, mtObj2Device, m_bStdCS, BlendMode::kNormal)) {
     render.Continue(nullptr);
+  }
   return render.GetResult();
 }
 

core/fpdfapi/render/cpdf_renderstatus.h

diff --git a/core/fpdfapi/render/cpdf_renderstatus.h b/core/fpdfapi/render/cpdf_renderstatus.h
index 5f89694..238ffaf 100644
--- a/core/fpdfapi/render/cpdf_renderstatus.h
+++ b/core/fpdfapi/render/cpdf_renderstatus.h
@@ -215,7 +215,6 @@
   bool m_bInGroup = false;
   CPDF_ColorSpace::Family m_GroupFamily = CPDF_ColorSpace::Family::kUnknown;
   FX_ARGB m_T3FillColor = 0;
-  BlendMode m_curBlend = BlendMode::kNormal;
 };
 
 #endif  // CORE_FPDFAPI_RENDER_CPDF_RENDERSTATUS_H_