From 8c41b1bf9fb7dd525f3a6b81d38f61d83500894d Mon Sep 17 00:00:00 2001
From: tsepez <tsepez@chromium.org>
Date: Wed, 28 Sep 2016 13:21:30 -0700
Subject: Revert "Rename CPDF_CountedObject to CFX_WeakPtr::Handle"

This reverts commit fe0179ded8202939ea4f2b92a879b8dede7821ea.

This is blocking incremental revision, will try again.

Review-Url: https://codereview.chromium.org/2377033003
---
 core/fpdfapi/fpdf_render/fpdf_render.cpp | 14 +++++++-------
 core/fpdfapi/fpdf_render/render_int.h    |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'core/fpdfapi/fpdf_render')

diff --git a/core/fpdfapi/fpdf_render/fpdf_render.cpp b/core/fpdfapi/fpdf_render/fpdf_render.cpp
index 0fdcb92ae1..8043f932bb 100644
--- a/core/fpdfapi/fpdf_render/fpdf_render.cpp
+++ b/core/fpdfapi/fpdf_render/fpdf_render.cpp
@@ -45,7 +45,7 @@ CPDF_DocRenderData::~CPDF_DocRenderData() {
 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;
@@ -55,7 +55,7 @@ void CPDF_DocRenderData::Clear(FX_BOOL bRelease) {
 
   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;
@@ -65,11 +65,11 @@ void CPDF_DocRenderData::Clear(FX_BOOL bRelease) {
 }
 
 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;
@@ -1086,7 +1086,7 @@ CPDF_TransferFunc* CPDF_DocRenderData::GetTransferFunc(CPDF_Object* pObj) {
 
   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();
   }
 
@@ -1109,8 +1109,8 @@ CPDF_TransferFunc* CPDF_DocRenderData::GetTransferFunc(CPDF_Object* pObj) {
       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];
diff --git a/core/fpdfapi/fpdf_render/render_int.h b/core/fpdfapi/fpdf_render/render_int.h
index 386da7661c..afd9c83b44 100644
--- a/core/fpdfapi/fpdf_render/render_int.h
+++ b/core/fpdfapi/fpdf_render/render_int.h
@@ -11,11 +11,11 @@
 #include <memory>
 #include <vector>
 
+#include "core/fpdfapi/fpdf_page/cpdf_countedobject.h"
 #include "core/fpdfapi/fpdf_page/cpdf_graphicstates.h"
 #include "core/fpdfapi/fpdf_page/include/cpdf_clippath.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_stream_acc.h"
 #include "core/fpdfapi/fpdf_render/include/cpdf_renderoptions.h"
-#include "core/fxcrt/include/cfx_weak_ptr.h"
 #include "core/fxge/include/cfx_fxgedevice.h"
 #include "core/fxge/include/cfx_renderdevice.h"
 
@@ -76,9 +76,9 @@ class CPDF_DocRenderData {
 
  private:
   using CPDF_Type3CacheMap =
-      std::map<CPDF_Font*, CFX_WeakPtr<CPDF_Type3Cache>::Handle*>;
+      std::map<CPDF_Font*, CPDF_CountedObject<CPDF_Type3Cache>*>;
   using CPDF_TransferFuncMap =
-      std::map<CPDF_Object*, CFX_WeakPtr<CPDF_TransferFunc>::Handle*>;
+      std::map<CPDF_Object*, CPDF_CountedObject<CPDF_TransferFunc>*>;
 
   CPDF_Document* m_pPDFDoc;
   CPDF_Type3CacheMap m_Type3FaceMap;
-- 
cgit v1.2.3