Revert "Rename CPDF_CountedObject to CFX_WeakPtr::Handle"

core/fpdfapi/fpdf_page/pageint.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef CORE_FPDFAPI_FPDF_PAGE_PAGEINT_H_
 #define CORE_FPDFAPI_FPDF_PAGE_PAGEINT_H_
 
 #include <map>
 #include <memory>
 #include <set>
 #include <unordered_map>
 #include <vector>
 
 #include "core/fpdfapi/fpdf_page/cpdf_contentmark.h"
-#include "core/fpdfapi/fpdf_page/cpdf_pattern.h"
-#include "core/fpdfapi/fpdf_page/include/cpdf_colorspace.h"
+#include "core/fpdfapi/fpdf_page/cpdf_countedobject.h"
 #include "core/fpdfapi/fpdf_page/include/cpdf_pageobjectholder.h"
-#include "core/fxcrt/include/cfx_weak_ptr.h"
 #include "core/fxge/include/cfx_pathdata.h"
 #include "core/fxge/include/cfx_renderdevice.h"
 
 class CPDF_AllStates;
+class CPDF_ColorSpace;
 class CPDF_ExpIntFunc;
 class CPDF_Font;
 class CPDF_FontEncoding;
 class CPDF_Form;
 class CPDF_IccProfile;
 class CPDF_Image;
 class CPDF_ImageObject;
 class CPDF_Page;
+class CPDF_Pattern;
 class CPDF_SampledFunc;
 class CPDF_StitchFunc;
 class CPDF_StreamAcc;
 class CPDF_TextObject;
 class CPDF_Type3Char;
 
 #define PARSE_STEP_LIMIT 100
 
 class CPDF_StreamParser {
  public:
@@ skipping 295 matching lines @@
   void ReleaseImage(const CPDF_Object* pImageStream);
   CPDF_IccProfile* GetIccProfile(CPDF_Stream* pIccProfileStream);
   void ReleaseIccProfile(const CPDF_IccProfile* pIccProfile);
   CPDF_StreamAcc* GetFontFileStreamAcc(CPDF_Stream* pFontStream);
   void ReleaseFontFileStreamAcc(const CPDF_Stream* pFontStream);
   FX_BOOL IsForceClear() const { return m_bForceClear; }
   CPDF_CountedColorSpace* FindColorSpacePtr(CPDF_Object* pCSObj) const;
   CPDF_CountedPattern* FindPatternPtr(CPDF_Object* pPatternObj) const;
 
  private:
-  using CPDF_CountedFont = CFX_WeakPtr<CPDF_Font>::Handle;
-  using CPDF_CountedIccProfile = CFX_WeakPtr<CPDF_IccProfile>::Handle;
-  using CPDF_CountedImage = CFX_WeakPtr<CPDF_Image>::Handle;
-  using CPDF_CountedStreamAcc = CFX_WeakPtr<CPDF_StreamAcc>::Handle;
+  using CPDF_CountedFont = CPDF_CountedObject<CPDF_Font>;
+  using CPDF_CountedIccProfile = CPDF_CountedObject<CPDF_IccProfile>;
+  using CPDF_CountedImage = CPDF_CountedObject<CPDF_Image>;
+  using CPDF_CountedStreamAcc = CPDF_CountedObject<CPDF_StreamAcc>;
 
   using CPDF_ColorSpaceMap =
       std::map<const CPDF_Object*, CPDF_CountedColorSpace*>;
   using CPDF_FontFileMap = std::map<const CPDF_Stream*, CPDF_CountedStreamAcc*>;
   using CPDF_FontMap = std::map<const CPDF_Dictionary*, CPDF_CountedFont*>;
   using CPDF_IccProfileMap =
       std::map<const CPDF_Stream*, CPDF_CountedIccProfile*>;
   using CPDF_ImageMap = std::map<uint32_t, CPDF_CountedImage*>;
   using CPDF_PatternMap = std::map<const CPDF_Object*, CPDF_CountedPattern*>;
 
@@ skipping 193 matching lines @@
 };
 
 CFX_ByteStringC PDF_FindKeyAbbreviationForTesting(const CFX_ByteStringC& abbr);
 CFX_ByteStringC PDF_FindValueAbbreviationForTesting(
     const CFX_ByteStringC& abbr);
 
 void PDF_ReplaceAbbr(CPDF_Object* pObj);
 bool IsPathOperator(const uint8_t* buf, size_t len);
 
 #endif  // CORE_FPDFAPI_FPDF_PAGE_PAGEINT_H_