commit 80ff4c457d62c3181b7a958f4d53bf89688ef1de
author Lei Zhang <thestig@chromium.org> Tue Jan 17 18:33:57 2023 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Jan 17 18:33:57 2023 +0000
tree edf1f5330384dcca48941c3b51836584e379facd
parent c363b521bcef5b96fc0397c0631b6dd18887b70c

Remove Upsample() out-parameters in fx_skia_device.cpp.

The Upsample() caller can get the bitmap dimensions directly without
going through Upsample().

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

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 b287d7a..412bcae 100644
--- a/core/fxge/skia/fx_skia_device.cpp
+++ b/core/fxge/skia/fx_skia_device.cpp
@@ -598,8 +598,6 @@
               DataVector<uint8_t>& dst8_storage,
               DataVector<uint32_t>& dst32_storage,
               SkBitmap* skBitmap,
-              int* widthPtr,
-              int* heightPtr,
               bool forceAlpha) {
   void* buffer = pSource->GetBuffer().data();
   if (!buffer)
@@ -692,8 +690,6 @@
   SkImageInfo imageInfo =
       SkImageInfo::Make(width, height, colorType, alphaType);
   skBitmap->installPixels(imageInfo, buffer, rowBytes);
-  *widthPtr = width;
-  *heightPtr = height;
   return true;
 }
 
@@ -2072,24 +2068,22 @@
   DataVector<uint32_t> mask32_storage;
   SkBitmap skBitmap;
   SkBitmap skMask;
-  int srcWidth;
-  int srcHeight;
-  int maskWidth;
-  int maskHeight;
-  if (!Upsample(pSource, src8_storage, src32_storage, &skBitmap, &srcWidth,
-                &srcHeight, /*forceAlpha=*/false)) {
+  if (!Upsample(pSource, src8_storage, src32_storage, &skBitmap,
+                /*forceAlpha=*/false)) {
     return false;
   }
-  if (!Upsample(pMask, mask8_storage, mask32_storage, &skMask, &maskWidth,
-                &maskHeight, /*forceAlpha=*/true)) {
+  if (!Upsample(pMask, mask8_storage, mask32_storage, &skMask,
+                /*forceAlpha=*/true)) {
     return false;
   }
   {
     m_pCache->FlushForDraw();
-
     SkAutoCanvasRestore scoped_save_restore(m_pCanvas, /*doSave=*/true);
+
+    const int src_width = pSource->GetWidth();
+    const int src_height = pSource->GetHeight();
     SkMatrix skMatrix;
-    SetBitmapMatrix(matrix, srcWidth, srcHeight, &skMatrix);
+    SetBitmapMatrix(matrix, src_width, src_height, &skMatrix);
     m_pCanvas->concat(skMatrix);
     SkPaint paint;
     SetBitmapPaintForMerge(pSource->IsMaskFormat(), !m_FillOptions.aliased_path,
@@ -2102,7 +2096,7 @@
         SkTileMode::kClamp, SkTileMode::kClamp, SkSamplingOptions());
     paint.setShader(
         SkShaders::Blend(SkBlendMode::kSrcIn, skMaskShader, skSrcShader));
-    SkRect r = {0, 0, SkIntToScalar(srcWidth), SkIntToScalar(srcHeight)};
+    SkRect r = {0, 0, SkIntToScalar(src_width), SkIntToScalar(src_height)};
     m_pCanvas->drawRect(r, paint);
   }
   DebugValidate(m_pBitmap, m_pBackdropBitmap);
@@ -2156,14 +2150,15 @@
   DataVector<uint8_t> dst8_storage;
   DataVector<uint32_t> dst32_storage;
   SkBitmap skBitmap;
-  int width;
-  int height;
-  if (!Upsample(pSource, dst8_storage, dst32_storage, &skBitmap, &width,
-                &height, /*forceAlpha=*/false)) {
+  if (!Upsample(pSource, dst8_storage, dst32_storage, &skBitmap,
+                /*forceAlpha=*/false)) {
     return false;
   }
   {
     SkAutoCanvasRestore scoped_save_restore(m_pCanvas, /*doSave=*/true);
+
+    const int width = pSource->GetWidth();
+    const int height = pSource->GetHeight();
     SkMatrix skMatrix;
     SetBitmapMatrix(matrix, width, height, &skMatrix);
     m_pCanvas->concat(skMatrix);