commit c1997e165a487a619336aa359a0f51c14b27aa8e
author Tom Sepez <tsepez@chromium.org> Fri Sep 02 16:48:23 2022 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Sep 02 16:48:23 2022 +0000
tree 907a06afa4a33cacedb65b8c563703c8d2c40ac4
parent a2ea597e7aca5ca96a36353a65df04d18a72b70c

Return CPDF_Reference from CPDF_Object::MakeReference()

The CPDF_Object superclass was presumably returned in the past to
avoid ambiguity in a lurking ?-operator expression, but that has
now been resolved by RetainPtr<> changes.

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

core/fpdfapi/parser/cpdf_object.cpp

diff --git a/core/fpdfapi/parser/cpdf_object.cpp b/core/fpdfapi/parser/cpdf_object.cpp
index 8723a80..42dfe10 100644
--- a/core/fpdfapi/parser/cpdf_object.cpp
+++ b/core/fpdfapi/parser/cpdf_object.cpp
@@ -183,7 +183,7 @@
   return nullptr;
 }
 
-RetainPtr<CPDF_Object> CPDF_Object::MakeReference(
+RetainPtr<CPDF_Reference> CPDF_Object::MakeReference(
     CPDF_IndirectObjectHolder* holder) const {
   if (IsInline()) {
     NOTREACHED();

core/fpdfapi/parser/cpdf_object.h

diff --git a/core/fpdfapi/parser/cpdf_object.h b/core/fpdfapi/parser/cpdf_object.h
index db9d3c7..93823a6 100644
--- a/core/fpdfapi/parser/cpdf_object.h
+++ b/core/fpdfapi/parser/cpdf_object.h
@@ -109,7 +109,7 @@
 
   // Return a reference to itself.
   // The object must be direct (!IsInlined).
-  virtual RetainPtr<CPDF_Object> MakeReference(
+  virtual RetainPtr<CPDF_Reference> MakeReference(
       CPDF_IndirectObjectHolder* holder) const;
 
   RetainPtr<CPDF_Object> GetMutableDirect();    // Wraps virtual method.

core/fpdfapi/parser/cpdf_reference.cpp

diff --git a/core/fpdfapi/parser/cpdf_reference.cpp b/core/fpdfapi/parser/cpdf_reference.cpp
index ef37f14..8196a27 100644
--- a/core/fpdfapi/parser/cpdf_reference.cpp
+++ b/core/fpdfapi/parser/cpdf_reference.cpp
@@ -90,7 +90,7 @@
          archive->WriteString(" 0 R ");
 }
 
-RetainPtr<CPDF_Object> CPDF_Reference::MakeReference(
+RetainPtr<CPDF_Reference> CPDF_Reference::MakeReference(
     CPDF_IndirectObjectHolder* holder) const {
   DCHECK_EQ(holder, m_pObjList);
   // Do not allow reference to reference, just create other reference for same

core/fpdfapi/parser/cpdf_reference.h

diff --git a/core/fpdfapi/parser/cpdf_reference.h b/core/fpdfapi/parser/cpdf_reference.h
index fd3249c..69be3d8 100644
--- a/core/fpdfapi/parser/cpdf_reference.h
+++ b/core/fpdfapi/parser/cpdf_reference.h
@@ -32,7 +32,7 @@
   const CPDF_Reference* AsReference() const override;
   bool WriteTo(IFX_ArchiveStream* archive,
                const CPDF_Encryptor* encryptor) const override;
-  RetainPtr<CPDF_Object> MakeReference(
+  RetainPtr<CPDF_Reference> MakeReference(
       CPDF_IndirectObjectHolder* holder) const override;
 
   uint32_t GetRefObjNum() const { return m_RefObjNum; }