commit 0e84dee9b41b970df4407ff812d0372418b1985d
author Lei Zhang <thestig@chromium.org> Fri Jan 13 19:36:47 2023 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Jan 13 19:36:47 2023 +0000
tree b3038194cd8771a3db060b87982337f92c2b13ba
parent a4147f8478c7a77d9f8a39890e1801110229055d

Remove both versions of CFX_SkiaDeviceDriver::PreMultiply().

One version is never used. The other is just a wrapper around
CFX_DIBitmap::PreMultiply().

Change-Id: I69f827724d63e60bdf17b5443040b5a989435354
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/103290
Reviewed-by: Nigi <nigi@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

core/fpdfapi/render/cpdf_imagerenderer.cpp

diff --git a/core/fpdfapi/render/cpdf_imagerenderer.cpp b/core/fpdfapi/render/cpdf_imagerenderer.cpp
index c436155..5fffbff 100644
--- a/core/fpdfapi/render/cpdf_imagerenderer.cpp
+++ b/core/fpdfapi/render/cpdf_imagerenderer.cpp
@@ -73,7 +73,7 @@
   if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
     RetainPtr<CFX_DIBitmap> premultiplied = base_bitmap->Realize();
     if (base_bitmap->IsAlphaFormat())
-      CFX_SkiaDeviceDriver::PreMultiply(premultiplied);
+      premultiplied->PreMultiply();
     return premultiplied;
   }
 #endif  // defined(_SKIA_SUPPORT_)

core/fpdfapi/render/cpdf_renderstatus.cpp

diff --git a/core/fpdfapi/render/cpdf_renderstatus.cpp b/core/fpdfapi/render/cpdf_renderstatus.cpp
index 3767159..7234b5e 100644
--- a/core/fpdfapi/render/cpdf_renderstatus.cpp
+++ b/core/fpdfapi/render/cpdf_renderstatus.cpp
@@ -1285,7 +1285,7 @@
       }
 #if defined(_SKIA_SUPPORT_)
       if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
-        CFX_SkiaDeviceDriver::PreMultiply(pDIBitmap);
+        pDIBitmap->PreMultiply();
 #endif
       if (m_pDevice->SetDIBits(pDIBitmap, left, top)) {
         return;

core/fxge/skia/fx_skia_device.cpp

diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp
index f3ed873..0e9c20f 100644
--- a/core/fxge/skia/fx_skia_device.cpp
+++ b/core/fxge/skia/fx_skia_device.cpp
@@ -1433,10 +1433,6 @@
   m_pCache->Flush();
 }
 
-void CFX_SkiaDeviceDriver::PreMultiply() {
-  m_pBitmap->PreMultiply();
-}
-
 bool CFX_SkiaDeviceDriver::DrawDeviceText(
     pdfium::span<const TextCharPos> pCharPos,
     CFX_Font* pFont,
@@ -2010,11 +2006,6 @@
   return false;
 }
 
-void CFX_SkiaDeviceDriver::PreMultiply(
-    const RetainPtr<CFX_DIBitmap>& pDIBitmap) {
-  pDIBitmap->PreMultiply();
-}
-
 void CFX_DIBitmap::PreMultiply() {
   if (this->GetBPP() != 32)
     return;

core/fxge/skia/fx_skia_device.h

diff --git a/core/fxge/skia/fx_skia_device.h b/core/fxge/skia/fx_skia_device.h
index dc4269e..71109a7 100644
--- a/core/fxge/skia/fx_skia_device.h
+++ b/core/fxge/skia/fx_skia_device.h
@@ -144,8 +144,6 @@
                    const SkMatrix& matrix);
   void Clear(uint32_t color);
   void Flush() override;
-  void PreMultiply();
-  static void PreMultiply(const RetainPtr<CFX_DIBitmap>& pDIBitmap);
   SkCanvas* SkiaCanvas() { return m_pCanvas; }
   void DebugVerifyBitmapIsPreMultiplied() const;
   void Dump() const;