Revert "Rename CPDF_CountedObject to CFX_WeakPtr::Handle"

core/fpdfapi/fpdf_render/fpdf_render.cpp

 // 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
 
 #include "core/fpdfapi/fpdf_render/render_int.h"
 
 #include <memory>
 
@@ skipping 27 matching lines @@
 CPDF_DocRenderData::CPDF_DocRenderData(CPDF_Document* pPDFDoc)
     : m_pPDFDoc(pPDFDoc) {}
 
 CPDF_DocRenderData::~CPDF_DocRenderData() {
   Clear(TRUE);
 }
 
 void CPDF_DocRenderData::Clear(FX_BOOL bRelease) {
   for (auto it = m_Type3FaceMap.begin(); it != m_Type3FaceMap.end();) {
     auto curr_it = it++;
-    CFX_WeakPtr<CPDF_Type3Cache>::Handle* cache = curr_it->second;
+    CPDF_CountedObject<CPDF_Type3Cache>* cache = curr_it->second;
     if (bRelease || cache->use_count() < 2) {
       delete cache->get();
       delete cache;
       m_Type3FaceMap.erase(curr_it);
     }
   }
 
   for (auto it = m_TransferFuncMap.begin(); it != m_TransferFuncMap.end();) {
     auto curr_it = it++;
-    CFX_WeakPtr<CPDF_TransferFunc>::Handle* value = curr_it->second;
+    CPDF_CountedObject<CPDF_TransferFunc>* value = curr_it->second;
     if (bRelease || value->use_count() < 2) {
       delete value->get();
       delete value;
       m_TransferFuncMap.erase(curr_it);
     }
   }
 }
 
 CPDF_Type3Cache* CPDF_DocRenderData::GetCachedType3(CPDF_Type3Font* pFont) {
-  CFX_WeakPtr<CPDF_Type3Cache>::Handle* pCache;
+  CPDF_CountedObject<CPDF_Type3Cache>* pCache;
   auto it = m_Type3FaceMap.find(pFont);
   if (it == m_Type3FaceMap.end()) {
     CPDF_Type3Cache* pType3 = new CPDF_Type3Cache(pFont);
-    pCache = new CFX_WeakPtr<CPDF_Type3Cache>::Handle(pType3);
+    pCache = new CPDF_CountedObject<CPDF_Type3Cache>(pType3);
     m_Type3FaceMap[pFont] = pCache;
   } else {
     pCache = it->second;
   }
   return pCache->AddRef();
 }
 
 void CPDF_DocRenderData::ReleaseCachedType3(CPDF_Type3Font* pFont) {
   auto it = m_Type3FaceMap.find(pFont);
   if (it != m_Type3FaceMap.end())
@@ skipping 996 matching lines @@
     }
   }
 }
 
 CPDF_TransferFunc* CPDF_DocRenderData::GetTransferFunc(CPDF_Object* pObj) {
   if (!pObj)
     return nullptr;
 
   auto it = m_TransferFuncMap.find(pObj);
   if (it != m_TransferFuncMap.end()) {
-    CFX_WeakPtr<CPDF_TransferFunc>::Handle* pTransferCounter = it->second;
+    CPDF_CountedObject<CPDF_TransferFunc>* pTransferCounter = it->second;
     return pTransferCounter->AddRef();
   }
 
   std::unique_ptr<CPDF_Function> pFuncs[3];
   FX_BOOL bUniTransfer = TRUE;
   FX_BOOL bIdentity = TRUE;
   if (CPDF_Array* pArray = pObj->AsArray()) {
     bUniTransfer = FALSE;
     if (pArray->GetCount() < 3)
       return nullptr;
 
     for (uint32_t i = 0; i < 3; ++i) {
       pFuncs[2 - i] = CPDF_Function::Load(pArray->GetDirectObjectAt(i));
       if (!pFuncs[2 - i])
         return nullptr;
     }
   } else {
     pFuncs[0] = CPDF_Function::Load(pObj);
     if (!pFuncs[0])
       return nullptr;
   }
   CPDF_TransferFunc* pTransfer = new CPDF_TransferFunc(m_pPDFDoc);
-  CFX_WeakPtr<CPDF_TransferFunc>::Handle* pTransferCounter =
-      new CFX_WeakPtr<CPDF_TransferFunc>::Handle(pTransfer);
+  CPDF_CountedObject<CPDF_TransferFunc>* pTransferCounter =
+      new CPDF_CountedObject<CPDF_TransferFunc>(pTransfer);
   m_TransferFuncMap[pObj] = pTransferCounter;
   static const int kMaxOutputs = 16;
   FX_FLOAT output[kMaxOutputs];
   FXSYS_memset(output, 0, sizeof(output));
   FX_FLOAT input;
   int noutput;
   for (int v = 0; v < 256; ++v) {
     input = (FX_FLOAT)v / 255.0f;
     if (bUniTransfer) {
       if (pFuncs[0] && pFuncs[0]->CountOutputs() <= kMaxOutputs)
@@ skipping 156 matching lines @@
     m_pDevice->StretchDIBits(m_pBitmapDevice->GetBitmap(), m_Rect.left,
                              m_Rect.top, m_Rect.Width(), m_Rect.Height());
   }
 }
 
 #if defined _SKIA_SUPPORT_
 void CPDF_RenderStatus::DebugVerifyDeviceIsPreMultiplied() const {
   m_pDevice->DebugVerifyBitmapIsPreMultiplied();
 }
 #endif