commit dab79f11778d31b7671ef9a47a05280539ce57a4
author Lei Zhang <thestig@chromium.org> Thu Oct 20 07:30:09 2022 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Oct 20 07:30:09 2022 +0000
tree 25023ce6b6c9402c669460c9742fa5210088fa8b
parent a3c920fb3d74e7bbb56a3e99f8d888aff0bdaedd

Remove data parameter from CPDF_Stream::InitStream() and rename.

The data parameter to InitStream() is always an empty span, so just
remove it. Also rename the method to InitStreamWithEmptyData() to better
reflect what it does now.

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

core/fpdfapi/parser/cpdf_stream.cpp

diff --git a/core/fpdfapi/parser/cpdf_stream.cpp b/core/fpdfapi/parser/cpdf_stream.cpp
index da7eb88..dc3e811 100644
--- a/core/fpdfapi/parser/cpdf_stream.cpp
+++ b/core/fpdfapi/parser/cpdf_stream.cpp
@@ -81,10 +81,9 @@
   return this;
 }
 
-void CPDF_Stream::InitStream(pdfium::span<const uint8_t> pData,
-                             RetainPtr<CPDF_Dictionary> pDict) {
+void CPDF_Stream::InitStreamWithEmptyData(RetainPtr<CPDF_Dictionary> pDict) {
   dict_ = std::move(pDict);
-  SetData(pData);
+  TakeData({});
 }
 
 void CPDF_Stream::InitStreamFromFile(RetainPtr<IFX_SeekableReadStream> pFile,

core/fpdfapi/parser/cpdf_stream.h

diff --git a/core/fpdfapi/parser/cpdf_stream.h b/core/fpdfapi/parser/cpdf_stream.h
index a1dc905..2856729 100644
--- a/core/fpdfapi/parser/cpdf_stream.h
+++ b/core/fpdfapi/parser/cpdf_stream.h
@@ -53,8 +53,7 @@
   void SetDataAndRemoveFilter(pdfium::span<const uint8_t> pData);
   void SetDataFromStringstreamAndRemoveFilter(fxcrt::ostringstream* stream);
 
-  void InitStream(pdfium::span<const uint8_t> pData,
-                  RetainPtr<CPDF_Dictionary> pDict);
+  void InitStreamWithEmptyData(RetainPtr<CPDF_Dictionary> pDict);
   void InitStreamFromFile(RetainPtr<IFX_SeekableReadStream> pFile,
                           RetainPtr<CPDF_Dictionary> pDict);
 

core/fpdfdoc/cpdf_bafontmap.cpp

diff --git a/core/fpdfdoc/cpdf_bafontmap.cpp b/core/fpdfdoc/cpdf_bafontmap.cpp
index e5b61d9..57e34fa 100644
--- a/core/fpdfdoc/cpdf_bafontmap.cpp
+++ b/core/fpdfdoc/cpdf_bafontmap.cpp
@@ -307,7 +307,7 @@
   RetainPtr<CPDF_Dictionary> pStreamDict = pStream->GetMutableDict();
   if (!pStreamDict) {
     pStreamDict = m_pDocument->New<CPDF_Dictionary>();
-    pStream->InitStream({}, pStreamDict);
+    pStream->InitStreamWithEmptyData(pStreamDict);
   }
 
   RetainPtr<CPDF_Dictionary> pStreamResList =

fpdfsdk/cpdfsdk_appstream.cpp

diff --git a/fpdfsdk/cpdfsdk_appstream.cpp b/fpdfsdk/cpdfsdk_appstream.cpp
index 1880bf8..cb3323c 100644
--- a/fpdfsdk/cpdfsdk_appstream.cpp
+++ b/fpdfsdk/cpdfsdk_appstream.cpp
@@ -1862,7 +1862,7 @@
         pStreamDict->SetFor("Resources", pResources->Clone());
     }
 
-    pStream->InitStream({}, pStreamDict);
+    pStream->InitStreamWithEmptyData(pStreamDict);
   }
   pStreamDict->SetMatrixFor("Matrix", widget_->GetMatrix());
   pStreamDict->SetRectFor("BBox", widget_->GetRotatedRect());