Move CFX_UnownedPtr to UnownedPtr
This CL moves CFX_UnownedPtr to UnownedPtr and places in the fxcrt
namespace.
Bug: pdfium:898
Change-Id: I6d1fa463f365e5cb3aafa8c8a7a5f7eff62ed8e0
Reviewed-on: https://pdfium-review.googlesource.com/14620
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
diff --git a/fpdfsdk/cba_annotiterator.h b/fpdfsdk/cba_annotiterator.h
index 36eacd9..8f9768d 100644
--- a/fpdfsdk/cba_annotiterator.h
+++ b/fpdfsdk/cba_annotiterator.h
@@ -10,9 +10,9 @@
#include <vector>
#include "core/fpdfdoc/cpdf_annot.h"
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_coordinates.h"
#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/unowned_ptr.h"
class CPDFSDK_Annot;
class CPDFSDK_PageView;
@@ -38,7 +38,7 @@
std::vector<size_t>* aSelect);
TabOrder m_eTabOrder;
- CFX_UnownedPtr<CPDFSDK_PageView> m_pPageView;
+ UnownedPtr<CPDFSDK_PageView> m_pPageView;
CPDF_Annot::Subtype m_nAnnotSubtype;
std::vector<CPDFSDK_Annot*> m_Annots;
};
diff --git a/fpdfsdk/cfx_systemhandler.h b/fpdfsdk/cfx_systemhandler.h
index a2ad024..f9138cc 100644
--- a/fpdfsdk/cfx_systemhandler.h
+++ b/fpdfsdk/cfx_systemhandler.h
@@ -7,10 +7,10 @@
#ifndef FPDFSDK_CFX_SYSTEMHANDLER_H_
#define FPDFSDK_CFX_SYSTEMHANDLER_H_
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_coordinates.h"
#include "core/fxcrt/fx_string.h"
#include "core/fxcrt/fx_system.h"
+#include "core/fxcrt/unowned_ptr.h"
using TimerCallback = void (*)(int32_t idEvent);
@@ -67,7 +67,7 @@
void KillTimer(int32_t nID);
private:
- CFX_UnownedPtr<CPDFSDK_FormFillEnvironment> const m_pFormFillEnv;
+ UnownedPtr<CPDFSDK_FormFillEnvironment> const m_pFormFillEnv;
};
#endif // FPDFSDK_CFX_SYSTEMHANDLER_H_
diff --git a/fpdfsdk/cpdfsdk_annot.h b/fpdfsdk/cpdfsdk_annot.h
index 325b429..a6c4066 100644
--- a/fpdfsdk/cpdfsdk_annot.h
+++ b/fpdfsdk/cpdfsdk_annot.h
@@ -10,8 +10,8 @@
#include "core/fpdfdoc/cpdf_aaction.h"
#include "core/fpdfdoc/cpdf_annot.h"
#include "core/fpdfdoc/cpdf_defaultappearance.h"
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/observable.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "fpdfsdk/cfx_systemhandler.h"
#include "fpdfsdk/fsdk_common.h"
#include "fpdfsdk/fsdk_define.h"
@@ -50,7 +50,7 @@
CPDFSDK_PageView* GetPageView() const { return m_pPageView.Get(); }
protected:
- CFX_UnownedPtr<CPDFSDK_PageView> const m_pPageView;
+ UnownedPtr<CPDFSDK_PageView> const m_pPageView;
};
#endif // FPDFSDK_CPDFSDK_ANNOT_H_
diff --git a/fpdfsdk/cpdfsdk_annothandlermgr.h b/fpdfsdk/cpdfsdk_annothandlermgr.h
index 21ccb3a..df4e1a2 100644
--- a/fpdfsdk/cpdfsdk_annothandlermgr.h
+++ b/fpdfsdk/cpdfsdk_annothandlermgr.h
@@ -11,8 +11,8 @@
#include <memory>
#include "core/fpdfdoc/cpdf_annot.h"
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "fpdfsdk/cpdfsdk_annot.h"
class CFX_Matrix;
diff --git a/fpdfsdk/cpdfsdk_baannot.h b/fpdfsdk/cpdfsdk_baannot.h
index c7300c4..ac3c0cb 100644
--- a/fpdfsdk/cpdfsdk_baannot.h
+++ b/fpdfsdk/cpdfsdk_baannot.h
@@ -95,7 +95,7 @@
int GetLayoutOrder() const override;
protected:
- CFX_UnownedPtr<CPDF_Annot> const m_pAnnot;
+ UnownedPtr<CPDF_Annot> const m_pAnnot;
};
#endif // FPDFSDK_CPDFSDK_BAANNOT_H_
diff --git a/fpdfsdk/cpdfsdk_formfillenvironment.h b/fpdfsdk/cpdfsdk_formfillenvironment.h
index d6f7088..31a1c51 100644
--- a/fpdfsdk/cpdfsdk_formfillenvironment.h
+++ b/fpdfsdk/cpdfsdk_formfillenvironment.h
@@ -227,7 +227,7 @@
std::map<UnderlyingPageType*, std::unique_ptr<CPDFSDK_PageView>> m_PageMap;
std::unique_ptr<CPDFSDK_InterForm> m_pInterForm;
CPDFSDK_Annot::ObservedPtr m_pFocusAnnot;
- CFX_UnownedPtr<UnderlyingDocumentType> m_pUnderlyingDoc;
+ UnownedPtr<UnderlyingDocumentType> m_pUnderlyingDoc;
std::unique_ptr<CFFL_InteractiveFormFiller> m_pFormFiller;
std::unique_ptr<CFX_SystemHandler> m_pSysHandler;
bool m_bChangeMask;
diff --git a/fpdfsdk/cpdfsdk_interform.h b/fpdfsdk/cpdfsdk_interform.h
index e14589e..76acaf9 100644
--- a/fpdfsdk/cpdfsdk_interform.h
+++ b/fpdfsdk/cpdfsdk_interform.h
@@ -13,7 +13,7 @@
#include "core/fpdfdoc/cpdf_action.h"
#include "core/fpdfdoc/ipdf_formnotify.h"
-#include "core/fxcrt/cfx_unowned_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "core/fxge/fx_dib.h"
#include "fpdfsdk/cpdfsdk_widget.h"
@@ -121,7 +121,7 @@
using CPDFSDK_WidgetMap = std::map<CPDF_FormControl*, CPDFSDK_Widget*>;
- CFX_UnownedPtr<CPDFSDK_FormFillEnvironment> m_pFormFillEnv;
+ UnownedPtr<CPDFSDK_FormFillEnvironment> m_pFormFillEnv;
std::unique_ptr<CPDF_InterForm> m_pInterForm;
CPDFSDK_WidgetMap m_Map;
#ifdef PDF_ENABLE_XFA
diff --git a/fpdfsdk/cpdfsdk_pageview.h b/fpdfsdk/cpdfsdk_pageview.h
index b86f305..03f3ab6 100644
--- a/fpdfsdk/cpdfsdk_pageview.h
+++ b/fpdfsdk/cpdfsdk_pageview.h
@@ -11,8 +11,8 @@
#include <vector>
#include "core/fpdfapi/page/cpdf_page.h"
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_system.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "fpdfsdk/cpdfsdk_annot.h"
#include "fpdfsdk/cpdfsdk_annothandlermgr.h"
@@ -117,7 +117,7 @@
UnderlyingPageType* const m_page;
std::unique_ptr<CPDF_AnnotList> m_pAnnotList;
std::vector<CPDFSDK_Annot*> m_SDKAnnotArray;
- CFX_UnownedPtr<CPDFSDK_FormFillEnvironment> const m_pFormFillEnv;
+ UnownedPtr<CPDFSDK_FormFillEnvironment> const m_pFormFillEnv;
CPDFSDK_Annot::ObservedPtr m_pCaptureWidget;
#ifndef PDF_ENABLE_XFA
bool m_bOwnsPage;
diff --git a/fpdfsdk/cpdfsdk_widget.h b/fpdfsdk/cpdfsdk_widget.h
index 5b2411e..f57e08d 100644
--- a/fpdfsdk/cpdfsdk_widget.h
+++ b/fpdfsdk/cpdfsdk_widget.h
@@ -12,9 +12,9 @@
#include "core/fpdfdoc/cpdf_aaction.h"
#include "core/fpdfdoc/cpdf_action.h"
#include "core/fpdfdoc/cpdf_annot.h"
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_coordinates.h"
#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "core/fxge/cfx_color.h"
#include "fpdfsdk/cpdfsdk_baannot.h"
#include "fpdfsdk/pdfsdk_fieldaction.h"
@@ -147,14 +147,14 @@
CFX_Color GetFillPWLColor() const;
private:
- CFX_UnownedPtr<CPDFSDK_InterForm> const m_pInterForm;
+ UnownedPtr<CPDFSDK_InterForm> const m_pInterForm;
bool m_bAppModified;
uint32_t m_nAppearanceAge;
uint32_t m_nValueAge;
#ifdef PDF_ENABLE_XFA
- mutable CFX_UnownedPtr<CXFA_FFWidget> m_hMixXFAWidget;
- mutable CFX_UnownedPtr<CXFA_FFWidgetHandler> m_pWidgetHandler;
+ mutable UnownedPtr<CXFA_FFWidget> m_hMixXFAWidget;
+ mutable UnownedPtr<CXFA_FFWidgetHandler> m_pWidgetHandler;
#endif // PDF_ENABLE_XFA
};
diff --git a/fpdfsdk/cpdfsdk_widgethandler.h b/fpdfsdk/cpdfsdk_widgethandler.h
index d83c98f..f8aa7de 100644
--- a/fpdfsdk/cpdfsdk_widgethandler.h
+++ b/fpdfsdk/cpdfsdk_widgethandler.h
@@ -7,8 +7,8 @@
#ifndef FPDFSDK_CPDFSDK_WIDGETHANDLER_H_
#define FPDFSDK_CPDFSDK_WIDGETHANDLER_H_
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "fpdfsdk/ipdfsdk_annothandler.h"
class CFFL_InteractiveFormFiller;
@@ -103,8 +103,8 @@
}
private:
- CFX_UnownedPtr<CPDFSDK_FormFillEnvironment> const m_pFormFillEnv;
- CFX_UnownedPtr<CFFL_InteractiveFormFiller> const m_pFormFiller;
+ UnownedPtr<CPDFSDK_FormFillEnvironment> const m_pFormFillEnv;
+ UnownedPtr<CFFL_InteractiveFormFiller> const m_pFormFiller;
};
#endif // FPDFSDK_CPDFSDK_WIDGETHANDLER_H_
diff --git a/fpdfsdk/cpdfsdk_xfawidget.h b/fpdfsdk/cpdfsdk_xfawidget.h
index 42448b8..d2635eb 100644
--- a/fpdfsdk/cpdfsdk_xfawidget.h
+++ b/fpdfsdk/cpdfsdk_xfawidget.h
@@ -7,9 +7,9 @@
#ifndef FPDFSDK_CPDFSDK_XFAWIDGET_H_
#define FPDFSDK_CPDFSDK_XFAWIDGET_H_
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_coordinates.h"
#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "fpdfsdk/cpdfsdk_annot.h"
class CPDFSDK_InterForm;
@@ -32,8 +32,8 @@
CPDFSDK_InterForm* GetInterForm() const { return m_pInterForm.Get(); }
private:
- CFX_UnownedPtr<CPDFSDK_InterForm> m_pInterForm;
- CFX_UnownedPtr<CXFA_FFWidget> m_hXFAWidget;
+ UnownedPtr<CPDFSDK_InterForm> m_pInterForm;
+ UnownedPtr<CXFA_FFWidget> m_hXFAWidget;
};
#endif // FPDFSDK_CPDFSDK_XFAWIDGET_H_
diff --git a/fpdfsdk/cpdfsdk_xfawidgethandler.h b/fpdfsdk/cpdfsdk_xfawidgethandler.h
index e26472d..e0dccbe 100644
--- a/fpdfsdk/cpdfsdk_xfawidgethandler.h
+++ b/fpdfsdk/cpdfsdk_xfawidgethandler.h
@@ -7,8 +7,8 @@
#ifndef FPDFSDK_CPDFSDK_XFAWIDGETHANDLER_H_
#define FPDFSDK_CPDFSDK_XFAWIDGETHANDLER_H_
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "fpdfsdk/ipdfsdk_annothandler.h"
class CFX_Matrix;
@@ -94,7 +94,7 @@
CXFA_FFWidgetHandler* GetXFAWidgetHandler(CPDFSDK_Annot* pAnnot);
uint32_t GetFWLFlags(uint32_t dwFlag);
- CFX_UnownedPtr<CPDFSDK_FormFillEnvironment> const m_pFormFillEnv;
+ UnownedPtr<CPDFSDK_FormFillEnvironment> const m_pFormFillEnv;
};
#endif // FPDFSDK_CPDFSDK_XFAWIDGETHANDLER_H_
diff --git a/fpdfsdk/formfiller/cba_fontmap.h b/fpdfsdk/formfiller/cba_fontmap.h
index 807cb65..45df8c8 100644
--- a/fpdfsdk/formfiller/cba_fontmap.h
+++ b/fpdfsdk/formfiller/cba_fontmap.h
@@ -7,7 +7,7 @@
#ifndef FPDFSDK_FORMFILLER_CBA_FONTMAP_H_
#define FPDFSDK_FORMFILLER_CBA_FONTMAP_H_
-#include "core/fxcrt/cfx_unowned_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "fpdfsdk/pwl/cpwl_font_map.h"
class CPDF_Dictionary;
@@ -36,9 +36,9 @@
CPDF_Font* GetAnnotDefaultFont(ByteString* csNameTag);
void AddFontToAnnotDict(CPDF_Font* pFont, const ByteString& sAlias);
- CFX_UnownedPtr<CPDF_Document> m_pDocument;
- CFX_UnownedPtr<CPDF_Dictionary> m_pAnnotDict;
- CFX_UnownedPtr<CPDF_Font> m_pDefaultFont;
+ UnownedPtr<CPDF_Document> m_pDocument;
+ UnownedPtr<CPDF_Dictionary> m_pAnnotDict;
+ UnownedPtr<CPDF_Font> m_pDefaultFont;
ByteString m_sDefaultFontName;
ByteString m_sAPType;
};
diff --git a/fpdfsdk/formfiller/cffl_formfiller.h b/fpdfsdk/formfiller/cffl_formfiller.h
index 26f6052..11a2f8c 100644
--- a/fpdfsdk/formfiller/cffl_formfiller.h
+++ b/fpdfsdk/formfiller/cffl_formfiller.h
@@ -9,7 +9,7 @@
#include <map>
-#include "core/fxcrt/cfx_unowned_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "fpdfsdk/formfiller/cba_fontmap.h"
#include "fpdfsdk/formfiller/cffl_interactiveformfiller.h"
#include "fpdfsdk/pdfsdk_fieldaction.h"
@@ -152,8 +152,8 @@
void InvalidateRect(const FX_RECT& rect);
- CFX_UnownedPtr<CPDFSDK_FormFillEnvironment> const m_pFormFillEnv;
- CFX_UnownedPtr<CPDFSDK_Widget> m_pWidget;
+ UnownedPtr<CPDFSDK_FormFillEnvironment> const m_pFormFillEnv;
+ UnownedPtr<CPDFSDK_Widget> m_pWidget;
bool m_bValid;
CFFL_PageView2PDFWindow m_Maps;
};
diff --git a/fpdfsdk/formfiller/cffl_interactiveformfiller.h b/fpdfsdk/formfiller/cffl_interactiveformfiller.h
index 553cbe8..7485dcf 100644
--- a/fpdfsdk/formfiller/cffl_interactiveformfiller.h
+++ b/fpdfsdk/formfiller/cffl_interactiveformfiller.h
@@ -11,7 +11,7 @@
#include <memory>
#include <utility>
-#include "core/fxcrt/cfx_unowned_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "fpdfsdk/cpdfsdk_annot.h"
#include "fpdfsdk/fsdk_define.h"
#include "fpdfsdk/pwl/cpwl_edit.h"
@@ -148,7 +148,7 @@
#endif // PDF_ENABLE_XFA
void UnRegisterFormFiller(CPDFSDK_Annot* pAnnot);
- CFX_UnownedPtr<CPDFSDK_FormFillEnvironment> const m_pFormFillEnv;
+ UnownedPtr<CPDFSDK_FormFillEnvironment> const m_pFormFillEnv;
CFFL_Widget2Filler m_Maps;
bool m_bNotifying;
};
diff --git a/fpdfsdk/fpdf_sysfontinfo.cpp b/fpdfsdk/fpdf_sysfontinfo.cpp
index 875f3fd..67b9a08 100644
--- a/fpdfsdk/fpdf_sysfontinfo.cpp
+++ b/fpdfsdk/fpdf_sysfontinfo.cpp
@@ -124,7 +124,7 @@
}
struct FPDF_SYSFONTINFO_DEFAULT : public FPDF_SYSFONTINFO {
- CFX_UnownedPtr<IFX_SystemFontInfo> m_pFontInfo;
+ UnownedPtr<IFX_SystemFontInfo> m_pFontInfo;
};
static void DefaultRelease(struct _FPDF_SYSFONTINFO* pThis) {
diff --git a/fpdfsdk/fpdfannot.cpp b/fpdfsdk/fpdfannot.cpp
index e08a3bf..3125ad1 100644
--- a/fpdfsdk/fpdfannot.cpp
+++ b/fpdfsdk/fpdfannot.cpp
@@ -160,8 +160,8 @@
private:
std::unique_ptr<CPDF_Form> m_pAnnotForm;
- CFX_UnownedPtr<CPDF_Dictionary> m_pAnnotDict;
- CFX_UnownedPtr<CPDF_Page> m_pPage;
+ UnownedPtr<CPDF_Dictionary> m_pAnnotDict;
+ UnownedPtr<CPDF_Page> m_pPage;
};
CPDF_AnnotContext* CPDFAnnotContextFromFPDFAnnotation(FPDF_ANNOTATION annot) {
diff --git a/fpdfsdk/fpdfdoc_unittest.cpp b/fpdfsdk/fpdfdoc_unittest.cpp
index 6409f70..b52cccf 100644
--- a/fpdfsdk/fpdfdoc_unittest.cpp
+++ b/fpdfsdk/fpdfdoc_unittest.cpp
@@ -87,7 +87,7 @@
protected:
std::unique_ptr<CPDF_TestPdfDocument> m_pDoc;
- CFX_UnownedPtr<CPDF_IndirectObjectHolder> m_pIndirectObjs;
+ UnownedPtr<CPDF_IndirectObjectHolder> m_pIndirectObjs;
std::unique_ptr<CPDF_Dictionary> m_pRootObj;
};
diff --git a/fpdfsdk/fpdfppo.cpp b/fpdfsdk/fpdfppo.cpp
index 230fd14..153ae2e 100644
--- a/fpdfsdk/fpdfppo.cpp
+++ b/fpdfsdk/fpdfppo.cpp
@@ -18,7 +18,7 @@
#include "core/fpdfapi/parser/cpdf_reference.h"
#include "core/fpdfapi/parser/cpdf_stream.h"
#include "core/fpdfapi/parser/cpdf_string.h"
-#include "core/fxcrt/cfx_unowned_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "fpdfsdk/fsdk_define.h"
#include "third_party/base/ptr_util.h"
#include "third_party/base/stl_util.h"
@@ -141,8 +141,8 @@
bool UpdateReference(CPDF_Object* pObj, ObjectNumberMap* pObjNumberMap);
uint32_t GetNewObjId(ObjectNumberMap* pObjNumberMap, CPDF_Reference* pRef);
- CFX_UnownedPtr<CPDF_Document> m_pDestPDFDoc;
- CFX_UnownedPtr<CPDF_Document> m_pSrcPDFDoc;
+ UnownedPtr<CPDF_Document> m_pDestPDFDoc;
+ UnownedPtr<CPDF_Document> m_pSrcPDFDoc;
};
CPDF_PageOrganizer::CPDF_PageOrganizer(CPDF_Document* pDestPDFDoc,
diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_context.h b/fpdfsdk/fpdfxfa/cpdfxfa_context.h
index df42cbb..52af64a 100644
--- a/fpdfsdk/fpdfxfa/cpdfxfa_context.h
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_context.h
@@ -10,9 +10,9 @@
#include <memory>
#include <vector>
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_system.h"
#include "core/fxcrt/observable.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.h"
#include "fpdfsdk/fpdfxfa/cpdfxfa_page.h"
#include "xfa/fxfa/cxfa_ffdoc.h"
@@ -105,7 +105,7 @@
std::unique_ptr<CPDF_Document> m_pPDFDoc;
std::unique_ptr<CXFA_FFDoc> m_pXFADoc;
Observable<CPDFSDK_FormFillEnvironment>::ObservedPtr m_pFormFillEnv;
- CFX_UnownedPtr<CXFA_FFDocView> m_pXFADocView;
+ UnownedPtr<CXFA_FFDocView> m_pXFADocView;
std::unique_ptr<CXFA_FFApp> m_pXFAApp;
std::unique_ptr<CJS_Runtime> m_pRuntime;
std::vector<RetainPtr<CPDFXFA_Page>> m_XFAPageList;
diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.h b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.h
index 6f7d41d..62830b0 100644
--- a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.h
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.h
@@ -7,8 +7,8 @@
#ifndef FPDFSDK_FPDFXFA_CPDFXFA_DOCENVIRONMENT_H_
#define FPDFSDK_FPDFXFA_CPDFXFA_DOCENVIRONMENT_H_
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/retain_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "public/fpdfview.h"
#include "xfa/fxfa/fxfa.h"
@@ -106,7 +106,7 @@
FPDF_DWORD flag);
void ToXFAContentFlags(WideString csSrcContent, FPDF_DWORD& flag);
- CFX_UnownedPtr<CPDFXFA_Context> const m_pContext;
+ UnownedPtr<CPDFXFA_Context> const m_pContext;
};
#endif // FPDFSDK_FPDFXFA_CPDFXFA_DOCENVIRONMENT_H_
diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_page.h b/fpdfsdk/fpdfxfa/cpdfxfa_page.h
index 5c4e0dc..f64d66b 100644
--- a/fpdfsdk/fpdfxfa/cpdfxfa_page.h
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_page.h
@@ -9,9 +9,9 @@
#include <memory>
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_system.h"
#include "core/fxcrt/retain_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
class CFX_Matrix;
class CPDFXFA_Context;
@@ -74,7 +74,7 @@
private:
std::unique_ptr<CPDF_Page> m_pPDFPage;
CXFA_FFPageView* m_pXFAPageView;
- CFX_UnownedPtr<CPDFXFA_Context> const m_pContext;
+ UnownedPtr<CPDFXFA_Context> const m_pContext;
const int m_iPageIndex;
};
diff --git a/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h b/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h
index 2b22c5f..d763f02 100644
--- a/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h
+++ b/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h
@@ -10,7 +10,7 @@
#include <memory>
#include <vector>
-#include "core/fxcrt/cfx_unowned_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "fpdfsdk/fpdfxfa/cpdfxfa_context.h"
#include "xfa/fwl/cfwl_timerinfo.h"
#include "xfa/fwl/ifwl_adaptertimermgr.h"
@@ -30,7 +30,7 @@
static void TimerProc(int32_t idEvent);
static std::vector<CFWL_TimerInfo*>* s_TimerArray;
- CFX_UnownedPtr<CPDFSDK_FormFillEnvironment> const m_pFormFillEnv;
+ UnownedPtr<CPDFSDK_FormFillEnvironment> const m_pFormFillEnv;
};
#endif // FPDFSDK_FPDFXFA_CXFA_FWLADAPTERTIMERMGR_H_
diff --git a/fpdfsdk/fsdk_pauseadapter.h b/fpdfsdk/fsdk_pauseadapter.h
index 25028f8..a0d0098 100644
--- a/fpdfsdk/fsdk_pauseadapter.h
+++ b/fpdfsdk/fsdk_pauseadapter.h
@@ -7,9 +7,9 @@
#ifndef FPDFSDK_FSDK_PAUSEADAPTER_H_
#define FPDFSDK_FSDK_PAUSEADAPTER_H_
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_system.h"
#include "core/fxcrt/ifx_pauseindicator.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "public/fpdf_progressive.h"
class IFSDK_PAUSE_Adapter : public IFX_PauseIndicator {
@@ -20,7 +20,7 @@
bool NeedToPauseNow() override;
private:
- CFX_UnownedPtr<IFSDK_PAUSE> const m_IPause;
+ UnownedPtr<IFSDK_PAUSE> const m_IPause;
};
#endif // FPDFSDK_FSDK_PAUSEADAPTER_H_
diff --git a/fpdfsdk/javascript/JS_EventHandler.h b/fpdfsdk/javascript/JS_EventHandler.h
index 8273b41..6f10ba5 100644
--- a/fpdfsdk/javascript/JS_EventHandler.h
+++ b/fpdfsdk/javascript/JS_EventHandler.h
@@ -7,9 +7,9 @@
#ifndef FPDFSDK_JAVASCRIPT_JS_EVENTHANDLER_H_
#define FPDFSDK_JAVASCRIPT_JS_EVENTHANDLER_H_
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_string.h"
#include "core/fxcrt/fx_system.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "fpdfsdk/cpdfsdk_formfillenvironment.h"
class CJS_EventContext;
@@ -166,13 +166,13 @@
JS_EVENT_T EventType() { return m_eEventType; }
public:
- CFX_UnownedPtr<CJS_EventContext> const m_pJSEventContext;
+ UnownedPtr<CJS_EventContext> const m_pJSEventContext;
JS_EVENT_T m_eEventType;
bool m_bValid;
WideString m_strTargetName;
WideString m_strSourceName;
- CFX_UnownedPtr<WideString> m_pWideStrChange;
+ UnownedPtr<WideString> m_pWideStrChange;
WideString m_WideStrChangeDu;
WideString m_WideStrChangeEx;
int m_nCommitKey;
@@ -184,12 +184,12 @@
int* m_pISelStart;
int m_nSelStartDu;
bool m_bWillCommit;
- CFX_UnownedPtr<WideString> m_pValue;
+ UnownedPtr<WideString> m_pValue;
bool m_bFieldFull;
bool* m_pbRc;
bool m_bRcDu;
- CFX_UnownedPtr<CPDF_Bookmark> m_pTargetBookMark;
+ UnownedPtr<CPDF_Bookmark> m_pTargetBookMark;
CPDFSDK_FormFillEnvironment::ObservedPtr m_pTargetFormFillEnv;
CPDFSDK_Annot::ObservedPtr m_pTargetAnnot;
};
diff --git a/fpdfsdk/javascript/JS_Object.h b/fpdfsdk/javascript/JS_Object.h
index e32b851..293b98a 100644
--- a/fpdfsdk/javascript/JS_Object.h
+++ b/fpdfsdk/javascript/JS_Object.h
@@ -26,7 +26,7 @@
CJS_Object* GetJSObject() const { return m_pJSObject.Get(); }
protected:
- CFX_UnownedPtr<CJS_Object> const m_pJSObject;
+ UnownedPtr<CJS_Object> const m_pJSObject;
};
class CJS_Object {
diff --git a/fpdfsdk/javascript/JS_Runtime_Stub.cpp b/fpdfsdk/javascript/JS_Runtime_Stub.cpp
index 068031f..d25e257 100644
--- a/fpdfsdk/javascript/JS_Runtime_Stub.cpp
+++ b/fpdfsdk/javascript/JS_Runtime_Stub.cpp
@@ -6,7 +6,7 @@
#include <memory>
-#include "core/fxcrt/cfx_unowned_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "fpdfsdk/javascript/ijs_event_context.h"
#include "fpdfsdk/javascript/ijs_runtime.h"
#include "third_party/base/ptr_util.h"
@@ -152,7 +152,7 @@
}
protected:
- CFX_UnownedPtr<CPDFSDK_FormFillEnvironment> const m_pFormFillEnv;
+ UnownedPtr<CPDFSDK_FormFillEnvironment> const m_pFormFillEnv;
std::unique_ptr<CJS_EventContextStub> m_pContext;
};
diff --git a/fpdfsdk/javascript/JS_Value.h b/fpdfsdk/javascript/JS_Value.h
index 1d430ee..8c94ca7 100644
--- a/fpdfsdk/javascript/JS_Value.h
+++ b/fpdfsdk/javascript/JS_Value.h
@@ -117,7 +117,7 @@
private:
bool m_bIsSetting;
CJS_Value m_Value;
- CFX_UnownedPtr<CJS_Runtime> const m_pJSRuntime;
+ UnownedPtr<CJS_Runtime> const m_pJSRuntime;
};
class CJS_Array {
diff --git a/fpdfsdk/javascript/cjs_event_context.h b/fpdfsdk/javascript/cjs_event_context.h
index a27bbd7..e6ab94e 100644
--- a/fpdfsdk/javascript/cjs_event_context.h
+++ b/fpdfsdk/javascript/cjs_event_context.h
@@ -9,9 +9,9 @@
#include <memory>
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_string.h"
#include "core/fxcrt/fx_system.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "fpdfsdk/javascript/ijs_event_context.h"
class CJS_EventHandler;
@@ -128,7 +128,7 @@
CPDFSDK_FormFillEnvironment* GetFormFillEnv();
private:
- CFX_UnownedPtr<CJS_Runtime> const m_pRuntime;
+ UnownedPtr<CJS_Runtime> const m_pRuntime;
std::unique_ptr<CJS_EventHandler> m_pEventHandler;
bool m_bBusy;
};
diff --git a/fpdfsdk/pwl/cpwl_appstream.h b/fpdfsdk/pwl/cpwl_appstream.h
index d73e3aa..810e79c 100644
--- a/fpdfsdk/pwl/cpwl_appstream.h
+++ b/fpdfsdk/pwl/cpwl_appstream.h
@@ -7,8 +7,8 @@
#ifndef FPDFSDK_PWL_CPWL_APPSTREAM_H_
#define FPDFSDK_PWL_CPWL_APPSTREAM_H_
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/unowned_ptr.h"
class CPDFSDK_Widget;
class CPDF_Dictionary;
@@ -36,8 +36,8 @@
ByteString GetBackgroundAppStream() const;
ByteString GetBorderAppStream() const;
- CFX_UnownedPtr<CPDFSDK_Widget> widget_;
- CFX_UnownedPtr<CPDF_Dictionary> dict_;
+ UnownedPtr<CPDFSDK_Widget> widget_;
+ UnownedPtr<CPDF_Dictionary> dict_;
};
#endif // FPDFSDK_PWL_CPWL_APPSTREAM_H_
diff --git a/fpdfsdk/pwl/cpwl_combo_box.h b/fpdfsdk/pwl/cpwl_combo_box.h
index c9fa2cd..d8e384e 100644
--- a/fpdfsdk/pwl/cpwl_combo_box.h
+++ b/fpdfsdk/pwl/cpwl_combo_box.h
@@ -9,7 +9,7 @@
#include <memory>
-#include "core/fxcrt/cfx_unowned_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "fpdfsdk/pwl/cpwl_edit.h"
#include "fpdfsdk/pwl/cpwl_list_box.h"
#include "fpdfsdk/pwl/cpwl_wnd.h"
@@ -89,15 +89,15 @@
void CreateListBox(const CreateParams& cp);
void SetPopup(bool bPopup);
- CFX_UnownedPtr<CPWL_Edit> m_pEdit;
- CFX_UnownedPtr<CPWL_CBButton> m_pButton;
- CFX_UnownedPtr<CPWL_CBListBox> m_pList;
+ UnownedPtr<CPWL_Edit> m_pEdit;
+ UnownedPtr<CPWL_CBButton> m_pButton;
+ UnownedPtr<CPWL_CBListBox> m_pList;
CFX_FloatRect m_rcOldWindow;
bool m_bPopup = false;
bool m_bBottom = true;
int32_t m_nSelectItem = -1;
- CFX_UnownedPtr<IPWL_Filler_Notify> m_pFillerNotify;
- CFX_UnownedPtr<CFFL_FormFiller> m_pFormFiller;
+ UnownedPtr<IPWL_Filler_Notify> m_pFillerNotify;
+ UnownedPtr<CFFL_FormFiller> m_pFormFiller;
};
#endif // FPDFSDK_PWL_CPWL_COMBO_BOX_H_
diff --git a/fpdfsdk/pwl/cpwl_edit.h b/fpdfsdk/pwl/cpwl_edit.h
index d61b947..d093f44 100644
--- a/fpdfsdk/pwl/cpwl_edit.h
+++ b/fpdfsdk/pwl/cpwl_edit.h
@@ -10,7 +10,7 @@
#include <utility>
#include "core/fpdfdoc/cpvt_wordrange.h"
-#include "core/fxcrt/cfx_unowned_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "fpdfsdk/pwl/cpwl_edit_ctrl.h"
#define PWL_CLASSNAME_EDIT "CPWL_Edit"
@@ -129,8 +129,8 @@
bool m_bFocus;
CFX_FloatRect m_rcOldWindow;
- CFX_UnownedPtr<IPWL_Filler_Notify> m_pFillerNotify;
- CFX_UnownedPtr<CFFL_FormFiller> m_pFormFiller;
+ UnownedPtr<IPWL_Filler_Notify> m_pFillerNotify;
+ UnownedPtr<CFFL_FormFiller> m_pFormFiller;
};
#endif // FPDFSDK_PWL_CPWL_EDIT_H_
diff --git a/fpdfsdk/pwl/cpwl_edit_impl.h b/fpdfsdk/pwl/cpwl_edit_impl.h
index a63b22c..76f756e 100644
--- a/fpdfsdk/pwl/cpwl_edit_impl.h
+++ b/fpdfsdk/pwl/cpwl_edit_impl.h
@@ -13,7 +13,7 @@
#include "core/fpdfdoc/cpvt_secprops.h"
#include "core/fpdfdoc/cpvt_wordprops.h"
-#include "core/fxcrt/cfx_unowned_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
#define FX_EDIT_ISLATINWORD(u) \
(u == 0x2D || (u <= 0x005A && u >= 0x0041) || \
@@ -144,7 +144,7 @@
void Undo() override;
private:
- CFX_UnownedPtr<CPWL_EditImpl> m_pEdit;
+ UnownedPtr<CPWL_EditImpl> m_pEdit;
CPVT_WordPlace m_wpOld;
CPVT_WordPlace m_wpNew;
@@ -167,7 +167,7 @@
void Undo() override;
private:
- CFX_UnownedPtr<CPWL_EditImpl> m_pEdit;
+ UnownedPtr<CPWL_EditImpl> m_pEdit;
CPVT_WordPlace m_wpOld;
CPVT_WordPlace m_wpNew;
@@ -191,7 +191,7 @@
void Undo() override;
private:
- CFX_UnownedPtr<CPWL_EditImpl> m_pEdit;
+ UnownedPtr<CPWL_EditImpl> m_pEdit;
CPVT_WordPlace m_wpOld;
CPVT_WordPlace m_wpNew;
@@ -218,7 +218,7 @@
void Undo() override;
private:
- CFX_UnownedPtr<CPWL_EditImpl> m_pEdit;
+ UnownedPtr<CPWL_EditImpl> m_pEdit;
CPVT_WordPlace m_wpOld;
CPVT_WordPlace m_wpNew;
@@ -241,7 +241,7 @@
void Undo() override;
private:
- CFX_UnownedPtr<CPWL_EditImpl> m_pEdit;
+ UnownedPtr<CPWL_EditImpl> m_pEdit;
CPVT_WordRange m_wrSel;
WideString m_swText;
@@ -261,7 +261,7 @@
void Undo() override;
private:
- CFX_UnownedPtr<CPWL_EditImpl> m_pEdit;
+ UnownedPtr<CPWL_EditImpl> m_pEdit;
CPVT_WordPlace m_wpOld;
CPVT_WordPlace m_wpNew;
@@ -430,8 +430,8 @@
private:
std::unique_ptr<CPDF_VariableText> m_pVT;
- CFX_UnownedPtr<CPWL_EditCtrl> m_pNotify;
- CFX_UnownedPtr<CPWL_Edit> m_pOperationNotify;
+ UnownedPtr<CPWL_EditCtrl> m_pNotify;
+ UnownedPtr<CPWL_Edit> m_pOperationNotify;
std::unique_ptr<CPWL_EditImpl_Provider> m_pVTProvider;
CPVT_WordPlace m_wpCaret;
CPVT_WordPlace m_wpOldCaret;
@@ -466,7 +466,7 @@
const CPVT_WordPlace& GetAt() const;
private:
- CFX_UnownedPtr<CPWL_EditImpl> m_pEdit;
+ UnownedPtr<CPWL_EditImpl> m_pEdit;
CPDF_VariableText::Iterator* m_pVTIterator;
};
diff --git a/fpdfsdk/pwl/cpwl_font_map.h b/fpdfsdk/pwl/cpwl_font_map.h
index 5336949..0712bf1 100644
--- a/fpdfsdk/pwl/cpwl_font_map.h
+++ b/fpdfsdk/pwl/cpwl_font_map.h
@@ -88,7 +88,7 @@
uint8_t nCharset);
std::unique_ptr<CPDF_Document> m_pPDFDoc;
- CFX_UnownedPtr<CFX_SystemHandler> const m_pSystemHandler;
+ UnownedPtr<CFX_SystemHandler> const m_pSystemHandler;
};
#endif // FPDFSDK_PWL_CPWL_FONT_MAP_H_
diff --git a/fpdfsdk/pwl/cpwl_icon.h b/fpdfsdk/pwl/cpwl_icon.h
index e2f792b..df88465 100644
--- a/fpdfsdk/pwl/cpwl_icon.h
+++ b/fpdfsdk/pwl/cpwl_icon.h
@@ -9,8 +9,8 @@
#include <utility>
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "fpdfsdk/pwl/cpwl_wnd.h"
class CPWL_Icon : public CPWL_Wnd {
@@ -37,8 +37,8 @@
// width, height
std::pair<float, float> GetImageSize();
- CFX_UnownedPtr<CPDF_Stream> m_pPDFStream;
- CFX_UnownedPtr<CPDF_IconFit> m_pIconFit;
+ UnownedPtr<CPDF_Stream> m_pPDFStream;
+ UnownedPtr<CPDF_IconFit> m_pIconFit;
};
#endif // FPDFSDK_PWL_CPWL_ICON_H_
diff --git a/fpdfsdk/pwl/cpwl_list_box.h b/fpdfsdk/pwl/cpwl_list_box.h
index 1e028f7..fec4d63 100644
--- a/fpdfsdk/pwl/cpwl_list_box.h
+++ b/fpdfsdk/pwl/cpwl_list_box.h
@@ -9,7 +9,7 @@
#include <memory>
-#include "core/fxcrt/cfx_unowned_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "fpdfsdk/pwl/cpwl_wnd.h"
class CPWL_ListCtrl;
@@ -35,7 +35,7 @@
void IOnInvalidateRect(CFX_FloatRect* pRect);
private:
- CFX_UnownedPtr<CPWL_ListBox> m_pList;
+ UnownedPtr<CPWL_ListBox> m_pList;
};
class CPWL_ListBox : public CPWL_Wnd {
@@ -101,10 +101,10 @@
std::unique_ptr<CPWL_List_Notify> m_pListNotify;
bool m_bMouseDown;
bool m_bHoverSel;
- CFX_UnownedPtr<IPWL_Filler_Notify> m_pFillerNotify;
+ UnownedPtr<IPWL_Filler_Notify> m_pFillerNotify;
private:
- CFX_UnownedPtr<CFFL_FormFiller> m_pFormFiller;
+ UnownedPtr<CFFL_FormFiller> m_pFormFiller;
};
#endif // FPDFSDK_PWL_CPWL_LIST_BOX_H_
diff --git a/fpdfsdk/pwl/cpwl_list_impl.h b/fpdfsdk/pwl/cpwl_list_impl.h
index 18ca0a3..e39a9c8 100644
--- a/fpdfsdk/pwl/cpwl_list_impl.h
+++ b/fpdfsdk/pwl/cpwl_list_impl.h
@@ -11,9 +11,9 @@
#include <memory>
#include <vector>
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_coordinates.h"
#include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/unowned_ptr.h"
class CPWL_EditImpl;
class CPWL_EditImpl_Iterator;
@@ -152,7 +152,7 @@
CFX_FloatRect m_rcPlate;
CFX_FloatRect m_rcContent;
- CFX_UnownedPtr<CPWL_List_Notify> m_pNotify;
+ UnownedPtr<CPWL_List_Notify> m_pNotify;
bool m_bNotifyFlag;
CFX_PointF m_ptScrollPos;
CPLST_Select m_aSelItems; // for multiple
@@ -162,7 +162,7 @@
int32_t m_nCaretIndex; // for multiple
std::vector<std::unique_ptr<Item>> m_ListItems;
float m_fFontSize;
- CFX_UnownedPtr<IPVT_FontMap> m_pFontMap;
+ UnownedPtr<IPVT_FontMap> m_pFontMap;
bool m_bMultiple;
};
diff --git a/fpdfsdk/pwl/cpwl_scroll_bar.h b/fpdfsdk/pwl/cpwl_scroll_bar.h
index 48aef16..1e71e3b 100644
--- a/fpdfsdk/pwl/cpwl_scroll_bar.h
+++ b/fpdfsdk/pwl/cpwl_scroll_bar.h
@@ -7,7 +7,7 @@
#ifndef FPDFSDK_PWL_CPWL_SCROLL_BAR_H_
#define FPDFSDK_PWL_CPWL_SCROLL_BAR_H_
-#include "core/fxcrt/cfx_unowned_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "fpdfsdk/pwl/cpwl_wnd.h"
class CPWL_SBButton;
@@ -170,9 +170,9 @@
PWL_SCROLLBAR_TYPE m_sbType;
PWL_SCROLL_INFO m_OriginInfo;
- CFX_UnownedPtr<CPWL_SBButton> m_pMinButton;
- CFX_UnownedPtr<CPWL_SBButton> m_pMaxButton;
- CFX_UnownedPtr<CPWL_SBButton> m_pPosButton;
+ UnownedPtr<CPWL_SBButton> m_pMinButton;
+ UnownedPtr<CPWL_SBButton> m_pMaxButton;
+ UnownedPtr<CPWL_SBButton> m_pPosButton;
PWL_SCROLL_PRIVATEDATA m_sData;
bool m_bMouseDown;
bool m_bMinOrMax;
diff --git a/fpdfsdk/pwl/cpwl_timer.h b/fpdfsdk/pwl/cpwl_timer.h
index 4a07425..6e082ab 100644
--- a/fpdfsdk/pwl/cpwl_timer.h
+++ b/fpdfsdk/pwl/cpwl_timer.h
@@ -7,7 +7,7 @@
#ifndef FPDFSDK_PWL_CPWL_TIMER_H_
#define FPDFSDK_PWL_CPWL_TIMER_H_
-#include "core/fxcrt/cfx_unowned_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
class CFX_SystemHandler;
class CPWL_TimerHandler;
@@ -24,8 +24,8 @@
private:
int32_t m_nTimerID;
- CFX_UnownedPtr<CPWL_TimerHandler> m_pAttached;
- CFX_UnownedPtr<CFX_SystemHandler> m_pSystemHandler;
+ UnownedPtr<CPWL_TimerHandler> m_pAttached;
+ UnownedPtr<CFX_SystemHandler> m_pSystemHandler;
};
#endif // FPDFSDK_PWL_CPWL_TIMER_H_
diff --git a/fpdfsdk/pwl/cpwl_wnd.cpp b/fpdfsdk/pwl/cpwl_wnd.cpp
index 9abe03c..d7eb853 100644
--- a/fpdfsdk/pwl/cpwl_wnd.cpp
+++ b/fpdfsdk/pwl/cpwl_wnd.cpp
@@ -131,9 +131,9 @@
private:
std::vector<CPWL_Wnd*> m_aMousePath;
std::vector<CPWL_Wnd*> m_aKeyboardPath;
- CFX_UnownedPtr<CPWL_Wnd> m_pCreatedWnd;
- CFX_UnownedPtr<CPWL_Wnd> m_pMainMouseWnd;
- CFX_UnownedPtr<CPWL_Wnd> m_pMainKeyboardWnd;
+ UnownedPtr<CPWL_Wnd> m_pCreatedWnd;
+ UnownedPtr<CPWL_Wnd> m_pMainMouseWnd;
+ UnownedPtr<CPWL_Wnd> m_pMainKeyboardWnd;
};
CPWL_Wnd::CPWL_Wnd()
diff --git a/fpdfsdk/pwl/cpwl_wnd.h b/fpdfsdk/pwl/cpwl_wnd.h
index ecef1e2..11b62b3 100644
--- a/fpdfsdk/pwl/cpwl_wnd.h
+++ b/fpdfsdk/pwl/cpwl_wnd.h
@@ -11,8 +11,8 @@
#include <vector>
#include "core/fpdfdoc/cpdf_formcontrol.h"
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/observable.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "core/fxge/cfx_color.h"
#include "fpdfsdk/cpdfsdk_formfillenvironment.h"
#include "fpdfsdk/cpdfsdk_widget.h"
@@ -131,7 +131,7 @@
CFX_SystemHandler* pSystemHandler; // required
IPVT_FontMap* pFontMap; // required
ProviderIface::ObservedPtr pProvider; // required
- CFX_UnownedPtr<FocusHandlerIface> pFocusHandler; // optional
+ UnownedPtr<FocusHandlerIface> pFocusHandler; // optional
uint32_t dwFlags; // optional
CFX_Color sBackgroundColor; // optional
CPDFSDK_Widget::ObservedPtr pAttachedWidget; // required
@@ -142,7 +142,7 @@
int32_t nTransparency; // optional
float fFontSize; // optional
CPWL_Dash sDash; // optional
- CFX_UnownedPtr<PrivateData> pAttachedData; // optional
+ UnownedPtr<PrivateData> pAttachedData; // optional
CPWL_Wnd* pParentWnd; // ignore
CPWL_MsgControl* pMsgControl; // ignore
int32_t eCursorType; // ignore
@@ -311,7 +311,7 @@
CreateParams m_CreationParams;
std::vector<CPWL_Wnd*> m_Children;
- CFX_UnownedPtr<CPWL_ScrollBar> m_pVScrollBar;
+ UnownedPtr<CPWL_ScrollBar> m_pVScrollBar;
CFX_FloatRect m_rcWindow;
CFX_FloatRect m_rcClip;
bool m_bCreated;