diff options
| author | tsepez <tsepez@chromium.org> | 2016-09-28 13:21:30 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-09-28 13:21:31 -0700 |
| commit | 8c41b1bf9fb7dd525f3a6b81d38f61d83500894d (patch) | |
| tree | 2f5db2cf2e80df46965f85140a05193793280d12 /core/fpdfapi/fpdf_render/render_int.h | |
| parent | 3b440ac32e3b9abaf6d013225b7a31a976b48759 (diff) | |
| download | pdfium-8c41b1bf9fb7dd525f3a6b81d38f61d83500894d.tar.xz | |
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
Diffstat (limited to 'core/fpdfapi/fpdf_render/render_int.h')
| -rw-r--r-- | core/fpdfapi/fpdf_render/render_int.h | 6 |
1 files changed, 3 insertions, 3 deletions
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; |