summaryrefslogtreecommitdiff
path: root/core/fpdfapi/fpdf_render
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2016-09-22 13:42:34 -0700
committerCommit bot <commit-bot@chromium.org>2016-09-22 13:42:34 -0700
commitfe0179ded8202939ea4f2b92a879b8dede7821ea (patch)
tree0d8dc52910041d8da0f2039018403dedf3c7332e /core/fpdfapi/fpdf_render
parenta939bfe3e102bfb28b4e8a5d951333d16badf80b (diff)
downloadpdfium-fe0179ded8202939ea4f2b92a879b8dede7821ea.tar.xz
Rename CPDF_CountedObject to CFX_WeakPtr::Handlechromium/2869
This better describes its purpose, and reduces confusion with the CFX_CountRef class, which is unrelated. The WeakPtr class itself that manipulates handles is NYI. Review-Url: https://codereview.chromium.org/2366673003
Diffstat (limited to 'core/fpdfapi/fpdf_render')
-rw-r--r--core/fpdfapi/fpdf_render/fpdf_render.cpp14
-rw-r--r--core/fpdfapi/fpdf_render/render_int.h6
2 files changed, 10 insertions, 10 deletions
diff --git a/core/fpdfapi/fpdf_render/fpdf_render.cpp b/core/fpdfapi/fpdf_render/fpdf_render.cpp
index 8043f932bb..0fdcb92ae1 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++;
- CPDF_CountedObject<CPDF_Type3Cache>* cache = curr_it->second;
+ CFX_WeakPtr<CPDF_Type3Cache>::Handle* 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++;
- CPDF_CountedObject<CPDF_TransferFunc>* value = curr_it->second;
+ CFX_WeakPtr<CPDF_TransferFunc>::Handle* 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) {
- CPDF_CountedObject<CPDF_Type3Cache>* pCache;
+ CFX_WeakPtr<CPDF_Type3Cache>::Handle* pCache;
auto it = m_Type3FaceMap.find(pFont);
if (it == m_Type3FaceMap.end()) {
CPDF_Type3Cache* pType3 = new CPDF_Type3Cache(pFont);
- pCache = new CPDF_CountedObject<CPDF_Type3Cache>(pType3);
+ pCache = new CFX_WeakPtr<CPDF_Type3Cache>::Handle(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()) {
- CPDF_CountedObject<CPDF_TransferFunc>* pTransferCounter = it->second;
+ CFX_WeakPtr<CPDF_TransferFunc>::Handle* 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);
- CPDF_CountedObject<CPDF_TransferFunc>* pTransferCounter =
- new CPDF_CountedObject<CPDF_TransferFunc>(pTransfer);
+ CFX_WeakPtr<CPDF_TransferFunc>::Handle* pTransferCounter =
+ new CFX_WeakPtr<CPDF_TransferFunc>::Handle(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 afd9c83b44..386da7661c 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*, CPDF_CountedObject<CPDF_Type3Cache>*>;
+ std::map<CPDF_Font*, CFX_WeakPtr<CPDF_Type3Cache>::Handle*>;
using CPDF_TransferFuncMap =
- std::map<CPDF_Object*, CPDF_CountedObject<CPDF_TransferFunc>*>;
+ std::map<CPDF_Object*, CFX_WeakPtr<CPDF_TransferFunc>::Handle*>;
CPDF_Document* m_pPDFDoc;
CPDF_Type3CacheMap m_Type3FaceMap;