commit 0a369cbe510fcbdc9b803cfb25834fd3e97b53e7
author Lei Zhang <thestig@chromium.org> Fri May 31 20:27:18 2024 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri May 31 20:27:18 2024 +0000
tree 5492c2d9f23fb406c51c313ada1cd3c60cc72b2e
parent ddefe228eba25585260da4dc5867dc9a0f7d1997

Fully switch from ObservePtr to RetainPtr in CPDF_DocPageData

Similar to https://pdfium-review.googlesource.com/116891, this makes all
stored page data in CPDF_DocPageData retained. Thus increasing cache
rates and avoiding parsing the same objects over and over again.

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

core/fpdfapi/page/cpdf_docpagedata.h

diff --git a/core/fpdfapi/page/cpdf_docpagedata.h b/core/fpdfapi/page/cpdf_docpagedata.h
index 1c578ab..25e276a 100644
--- a/core/fpdfapi/page/cpdf_docpagedata.h
+++ b/core/fpdfapi/page/cpdf_docpagedata.h
@@ -17,7 +17,6 @@
 #include "core/fxcrt/bytestring.h"
 #include "core/fxcrt/fx_codepage_forward.h"
 #include "core/fxcrt/fx_coordinates.h"
-#include "core/fxcrt/observed_ptr.h"
 #include "core/fxcrt/retain_ptr.h"
 
 class CFX_Font;
@@ -120,16 +119,15 @@
 
   // Specific destruction order may be required between maps.
   std::map<HashIccProfileKey, RetainPtr<const CPDF_Stream>> m_HashIccProfileMap;
-  std::map<RetainPtr<const CPDF_Array>, ObservedPtr<CPDF_ColorSpace>>
+  std::map<RetainPtr<const CPDF_Array>, RetainPtr<CPDF_ColorSpace>>
       m_ColorSpaceMap;
   std::map<RetainPtr<const CPDF_Stream>, RetainPtr<CPDF_StreamAcc>>
       m_FontFileMap;
   std::map<RetainPtr<const CPDF_Stream>, RetainPtr<CPDF_IccProfile>>
       m_IccProfileMap;
-  std::map<RetainPtr<const CPDF_Object>, ObservedPtr<CPDF_Pattern>>
-      m_PatternMap;
+  std::map<RetainPtr<const CPDF_Object>, RetainPtr<CPDF_Pattern>> m_PatternMap;
   std::map<uint32_t, RetainPtr<CPDF_Image>> m_ImageMap;
-  std::map<RetainPtr<const CPDF_Dictionary>, ObservedPtr<CPDF_Font>> m_FontMap;
+  std::map<RetainPtr<const CPDF_Dictionary>, RetainPtr<CPDF_Font>> m_FontMap;
 };
 
 #endif  // CORE_FPDFAPI_PAGE_CPDF_DOCPAGEDATA_H_