commit f5c376f93d33709ecd6b0dc8147b14a651ddbfeb
author Lukasz Anforowicz <lukasza@google.com> Fri Oct 24 20:08:14 2025 -0700
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Oct 24 20:08:14 2025 -0700
tree eb3a6e68b71fc652b7bce174a3ca96ba6038330a
parent 553e531de10b8096779b3d3c77724781f6cfe0e4

[rust png] Stop using hungarian (`dwFoo` / `pFoo`) in `ReadMoreData`.

Just renaming variables and parameters to use `google_style` rather
than `dwHungarianStyle`.

Bug: 444045690
Change-Id: Iea887673c97f9870f64a935d41b701aa147c8e3a
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/137271
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Łukasz Anforowicz <lukasza@google.com>

core/fxcodec/progressive_decoder.cpp

diff --git a/core/fxcodec/progressive_decoder.cpp b/core/fxcodec/progressive_decoder.cpp
index 52494ff..d551a1f 100644
--- a/core/fxcodec/progressive_decoder.cpp
+++ b/core/fxcodec/progressive_decoder.cpp
@@ -725,34 +725,33 @@
   return false;
 }
 
-bool ProgressiveDecoder::ReadMoreData(
-    ProgressiveDecoderIface* pModule,
-    ProgressiveDecoderIface::Context* pContext,
-    FXCODEC_STATUS* err_status) {
+bool ProgressiveDecoder::ReadMoreData(ProgressiveDecoderIface* decoder,
+                                      ProgressiveDecoderIface::Context* context,
+                                      FXCODEC_STATUS* err_status) {
   // Check for EOF.
   if (offset_ >= static_cast<uint32_t>(file_->GetSize())) {
     return false;
   }
 
   // Try to get whatever remains.
-  uint32_t dwBytesToFetchFromFile =
+  uint32_t bytes_to_fetch_from_file =
       pdfium::checked_cast<uint32_t>(file_->GetSize() - offset_);
 
   // Figure out if the codec stopped processing midway through the buffer.
-  size_t dwUnconsumed;
-  FX_SAFE_SIZE_T avail_input = pModule->GetAvailInput(pContext);
-  if (!avail_input.AssignIfValid(&dwUnconsumed)) {
+  size_t unconsumed_bytes;
+  FX_SAFE_SIZE_T avail_input = decoder->GetAvailInput(context);
+  if (!avail_input.AssignIfValid(&unconsumed_bytes)) {
     return false;
   }
 
-  if (dwUnconsumed == codec_memory_->GetSize()) {
+  if (unconsumed_bytes == codec_memory_->GetSize()) {
     // Codec couldn't make any progress against the bytes in the buffer.
     // Increase the buffer size so that there might be enough contiguous
     // bytes to allow whatever operation is having difficulty to succeed.
-    dwBytesToFetchFromFile =
-        std::min<uint32_t>(dwBytesToFetchFromFile, kBlockSize);
-    size_t dwNewSize = codec_memory_->GetSize() + dwBytesToFetchFromFile;
-    if (!codec_memory_->TryResize(dwNewSize)) {
+    bytes_to_fetch_from_file =
+        std::min<uint32_t>(bytes_to_fetch_from_file, kBlockSize);
+    size_t new_size = codec_memory_->GetSize() + bytes_to_fetch_from_file;
+    if (!codec_memory_->TryResize(new_size)) {
       *err_status = FXCODEC_STATUS::kError;
       return false;
     }
@@ -760,23 +759,23 @@
     // TODO(crbug.com/pdfium/1904): Simplify the `CFX_CodecMemory` API so we
     // don't need to do this awkward dance to free up exactly enough buffer
     // space for the next read.
-    size_t dwConsumable = codec_memory_->GetSize() - dwUnconsumed;
-    dwBytesToFetchFromFile = pdfium::checked_cast<uint32_t>(
-        std::min<size_t>(dwBytesToFetchFromFile, dwConsumable));
-    codec_memory_->Consume(dwBytesToFetchFromFile);
-    codec_memory_->Seek(dwConsumable - dwBytesToFetchFromFile);
-    dwUnconsumed += codec_memory_->GetPosition();
+    size_t already_read_bytes = codec_memory_->GetSize() - unconsumed_bytes;
+    bytes_to_fetch_from_file = pdfium::checked_cast<uint32_t>(
+        std::min<size_t>(bytes_to_fetch_from_file, already_read_bytes));
+    codec_memory_->Consume(bytes_to_fetch_from_file);
+    codec_memory_->Seek(already_read_bytes - bytes_to_fetch_from_file);
+    unconsumed_bytes += codec_memory_->GetPosition();
   }
 
   // Append new data past the bytes not yet processed by the codec.
   if (!file_->ReadBlockAtOffset(codec_memory_->GetBufferSpan().subspan(
-                                    dwUnconsumed, dwBytesToFetchFromFile),
+                                    unconsumed_bytes, bytes_to_fetch_from_file),
                                 offset_)) {
     *err_status = FXCODEC_STATUS::kError;
     return false;
   }
-  offset_ += dwBytesToFetchFromFile;
-  return pModule->Input(pContext, codec_memory_);
+  offset_ += bytes_to_fetch_from_file;
+  return decoder->Input(context, codec_memory_);
 }
 
 FXCODEC_STATUS ProgressiveDecoder::LoadImageInfo(

core/fxcodec/progressive_decoder.h

diff --git a/core/fxcodec/progressive_decoder.h b/core/fxcodec/progressive_decoder.h
index e1a1766..97ca5d0 100644
--- a/core/fxcodec/progressive_decoder.h
+++ b/core/fxcodec/progressive_decoder.h
@@ -160,8 +160,8 @@
 
   bool DetectImageType(FXCODEC_IMAGE_TYPE imageType,
                        CFX_DIBAttribute* pAttribute);
-  bool ReadMoreData(ProgressiveDecoderIface* pModule,
-                    ProgressiveDecoderIface::Context* pContext,
+  bool ReadMoreData(ProgressiveDecoderIface* decoder,
+                    ProgressiveDecoderIface::Context* context,
                     FXCODEC_STATUS* err_status);
 
   void SetTransMethod();