commit 7532c21d1e618096e10e69714a80ab37c4c63c98
author Lei Zhang <thestig@chromium.org> Mon Jan 08 22:54:40 2024 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Jan 08 22:54:40 2024 +0000
tree b962d7aa713d4613d86b8a0c3b1f05f78f6c2137
parent b0a3f99a95f4b699fe4bf29dd81331a45606eecb

Remove dead code in CFX_DefaultRenderDevice::AttachAggImpl()

Remove a check that never evaluates to true in AttachAggImpl() and
replace it with a CHECK() instead. Also add a comment in
AttachSkiaImpl() to explain why the Skia version still needs the check.

Change-Id: I9e81249b18a01e15a1b2bd8e9e21ecbdbc33a0b4
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/114953
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>

core/fxge/agg/fx_agg_driver.cpp

diff --git a/core/fxge/agg/fx_agg_driver.cpp b/core/fxge/agg/fx_agg_driver.cpp
index fd3c75e..70159ea 100644
--- a/core/fxge/agg/fx_agg_driver.cpp
+++ b/core/fxge/agg/fx_agg_driver.cpp
@@ -1382,9 +1382,8 @@
     bool bRgbByteOrder,
     RetainPtr<CFX_DIBitmap> pBackdropBitmap,
     bool bGroupKnockout) {
-  if (!pBitmap)
-    return false;
-
+  // Unlike the Skia version, all callers pass in a non-null `pBitmap`.
+  CHECK(pBitmap);
   SetBitmap(pBitmap);
   SetDeviceDriver(std::make_unique<pdfium::CFX_AggDeviceDriver>(
       std::move(pBitmap), bRgbByteOrder, std::move(pBackdropBitmap),

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 ddd3d44..7c31bcf 100644
--- a/core/fxge/skia/fx_skia_device.cpp
+++ b/core/fxge/skia/fx_skia_device.cpp
@@ -1635,6 +1635,8 @@
     bool bRgbByteOrder,
     RetainPtr<CFX_DIBitmap> pBackdropBitmap,
     bool bGroupKnockout) {
+  // FPDF_FFLDrawSkia() ends up calling this method with a deliberately null
+  // `pBitmap`.
   if (!pBitmap)
     return false;
   SetBitmap(pBitmap);