diff options
| author | tsepez <tsepez@chromium.org> | 2016-09-22 13:42:34 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-09-22 13:42:34 -0700 |
| commit | fe0179ded8202939ea4f2b92a879b8dede7821ea (patch) | |
| tree | 0d8dc52910041d8da0f2039018403dedf3c7332e /core/fpdfapi/fpdf_page/pageint.h | |
| parent | a939bfe3e102bfb28b4e8a5d951333d16badf80b (diff) | |
| download | pdfium-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_page/pageint.h')
| -rw-r--r-- | core/fpdfapi/fpdf_page/pageint.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/core/fpdfapi/fpdf_page/pageint.h b/core/fpdfapi/fpdf_page/pageint.h index 427a363e8e..8b3f863e77 100644 --- a/core/fpdfapi/fpdf_page/pageint.h +++ b/core/fpdfapi/fpdf_page/pageint.h @@ -14,13 +14,14 @@ #include <vector> #include "core/fpdfapi/fpdf_page/cpdf_contentmark.h" -#include "core/fpdfapi/fpdf_page/cpdf_countedobject.h" +#include "core/fpdfapi/fpdf_page/cpdf_pattern.h" +#include "core/fpdfapi/fpdf_page/include/cpdf_colorspace.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; @@ -29,7 +30,6 @@ class CPDF_IccProfile; class CPDF_Image; class CPDF_ImageObject; class CPDF_Page; -class CPDF_Pattern; class CPDF_SampledFunc; class CPDF_StitchFunc; class CPDF_StreamAcc; @@ -345,10 +345,10 @@ class CPDF_DocPageData { CPDF_CountedPattern* FindPatternPtr(CPDF_Object* pPatternObj) const; private: - 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_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_ColorSpaceMap = std::map<const CPDF_Object*, CPDF_CountedColorSpace*>; |