summaryrefslogtreecommitdiff
path: root/core/fpdfapi/fpdf_page/pageint.h
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2016-09-28 13:21:30 -0700
committerCommit bot <commit-bot@chromium.org>2016-09-28 13:21:31 -0700
commit8c41b1bf9fb7dd525f3a6b81d38f61d83500894d (patch)
tree2f5db2cf2e80df46965f85140a05193793280d12 /core/fpdfapi/fpdf_page/pageint.h
parent3b440ac32e3b9abaf6d013225b7a31a976b48759 (diff)
downloadpdfium-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_page/pageint.h')
-rw-r--r--core/fpdfapi/fpdf_page/pageint.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/core/fpdfapi/fpdf_page/pageint.h b/core/fpdfapi/fpdf_page/pageint.h
index 8b3f863e77..427a363e8e 100644
--- a/core/fpdfapi/fpdf_page/pageint.h
+++ b/core/fpdfapi/fpdf_page/pageint.h
@@ -14,14 +14,13 @@
#include <vector>
#include "core/fpdfapi/fpdf_page/cpdf_contentmark.h"
-#include "core/fpdfapi/fpdf_page/cpdf_pattern.h"
-#include "core/fpdfapi/fpdf_page/include/cpdf_colorspace.h"
+#include "core/fpdfapi/fpdf_page/cpdf_countedobject.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;
@@ -30,6 +29,7 @@ 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 = 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_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_ColorSpaceMap =
std::map<const CPDF_Object*, CPDF_CountedColorSpace*>;