summaryrefslogtreecommitdiff
path: root/xfa
diff options
context:
space:
mode:
Diffstat (limited to 'xfa')
-rw-r--r--xfa/fde/cfde_texteditengine.cpp4
-rw-r--r--xfa/fde/cfde_texteditengine.h4
-rw-r--r--xfa/fgas/font/cfgas_gefont.h2
-rw-r--r--xfa/fgas/font/cfgas_pdffontmgr.h4
-rw-r--r--xfa/fgas/layout/cfx_breakpiece.h4
-rw-r--r--xfa/fwl/cfwl_app.h2
-rw-r--r--xfa/fwl/cfwl_caret.h2
-rw-r--r--xfa/fwl/cfwl_timer.h4
-rw-r--r--xfa/fwl/cfwl_timerinfo.h4
-rw-r--r--xfa/fwl/cfwl_widget.h8
-rw-r--r--xfa/fwl/cfwl_widgetmgr.h2
-rw-r--r--xfa/fxfa/cxfa_ffapp.h4
-rw-r--r--xfa/fxfa/cxfa_ffdoc.h8
-rw-r--r--xfa/fxfa/cxfa_ffdocview.h10
-rw-r--r--xfa/fxfa/cxfa_ffnotify.h2
-rw-r--r--xfa/fxfa/cxfa_ffpageview.h4
-rw-r--r--xfa/fxfa/cxfa_ffwidget.h2
-rw-r--r--xfa/fxfa/cxfa_fwltheme.h2
-rw-r--r--xfa/fxfa/cxfa_widgetacciterator.h4
-rw-r--r--xfa/fxfa/fm2js/cxfa_fm2jscontext.h2
-rw-r--r--xfa/fxfa/parser/cxfa_dataexporter.h2
-rw-r--r--xfa/fxfa/parser/cxfa_dataimporter.h4
-rw-r--r--xfa/fxfa/parser/cxfa_layoutprocessor.h4
-rw-r--r--xfa/fxfa/parser/cxfa_nodelocale.h2
-rw-r--r--xfa/fxfa/parser/cxfa_object.h2
-rw-r--r--xfa/fxfa/parser/cxfa_scriptcontext.h2
26 files changed, 47 insertions, 47 deletions
diff --git a/xfa/fde/cfde_texteditengine.cpp b/xfa/fde/cfde_texteditengine.cpp
index d54126f3c3..a240132ec0 100644
--- a/xfa/fde/cfde_texteditengine.cpp
+++ b/xfa/fde/cfde_texteditengine.cpp
@@ -38,7 +38,7 @@ class InsertOperation : public CFDE_TextEditEngine::Operation {
}
private:
- CFX_UnownedPtr<CFDE_TextEditEngine> engine_;
+ UnownedPtr<CFDE_TextEditEngine> engine_;
size_t start_idx_;
WideString added_text_;
};
@@ -63,7 +63,7 @@ class DeleteOperation : public CFDE_TextEditEngine::Operation {
}
private:
- CFX_UnownedPtr<CFDE_TextEditEngine> engine_;
+ UnownedPtr<CFDE_TextEditEngine> engine_;
size_t start_idx_;
WideString removed_text_;
};
diff --git a/xfa/fde/cfde_texteditengine.h b/xfa/fde/cfde_texteditengine.h
index 7b739be711..43cfe0c0d3 100644
--- a/xfa/fde/cfde_texteditengine.h
+++ b/xfa/fde/cfde_texteditengine.h
@@ -49,7 +49,7 @@ class CFDE_TextEditEngine {
bool IsEOF(bool bPrev) const;
private:
- CFX_UnownedPtr<const CFDE_TextEditEngine> engine_;
+ UnownedPtr<const CFDE_TextEditEngine> engine_;
int32_t current_position_;
};
@@ -200,7 +200,7 @@ class CFDE_TextEditEngine {
};
CFX_RectF contents_bounding_box_;
- CFX_UnownedPtr<Delegate> delegate_;
+ UnownedPtr<Delegate> delegate_;
std::vector<FDE_TEXTEDITPIECE> text_piece_info_;
std::vector<size_t> char_widths_;
CFX_TxtBreak text_break_;
diff --git a/xfa/fgas/font/cfgas_gefont.h b/xfa/fgas/font/cfgas_gefont.h
index f88f8b4cd9..9df9ea842d 100644
--- a/xfa/fgas/font/cfgas_gefont.h
+++ b/xfa/fgas/font/cfgas_gefont.h
@@ -11,9 +11,9 @@
#include <memory>
#include <vector>
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_memory.h"
#include "core/fxcrt/retain_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "xfa/fgas/font/cfgas_fontmgr.h"
#include "xfa/fgas/font/cfgas_pdffontmgr.h"
diff --git a/xfa/fgas/font/cfgas_pdffontmgr.h b/xfa/fgas/font/cfgas_pdffontmgr.h
index 1f7d49a4e7..410aa009b0 100644
--- a/xfa/fgas/font/cfgas_pdffontmgr.h
+++ b/xfa/fgas/font/cfgas_pdffontmgr.h
@@ -50,8 +50,8 @@ class CFGAS_PDFFontMgr : public Observable<CFGAS_PDFFontMgr> {
const ByteString& bsDRFontName,
bool bStrictMatch);
- CFX_UnownedPtr<CPDF_Document> const m_pDoc;
- CFX_UnownedPtr<CFGAS_FontMgr> const m_pFontMgr;
+ UnownedPtr<CPDF_Document> const m_pDoc;
+ UnownedPtr<CFGAS_FontMgr> const m_pFontMgr;
std::map<RetainPtr<CFGAS_GEFont>, CPDF_Font*> m_FDE2PDFFont;
std::map<ByteString, RetainPtr<CFGAS_GEFont>> m_FontMap;
};
diff --git a/xfa/fgas/layout/cfx_breakpiece.h b/xfa/fgas/layout/cfx_breakpiece.h
index 1109e2296b..5dbc0e7722 100644
--- a/xfa/fgas/layout/cfx_breakpiece.h
+++ b/xfa/fgas/layout/cfx_breakpiece.h
@@ -10,9 +10,9 @@
#include <vector>
#include "core/fxcrt/cfx_char.h"
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_string.h"
#include "core/fxcrt/retain_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "xfa/fxfa/cxfa_textuserdata.h"
class CFX_BreakPiece {
@@ -40,7 +40,7 @@ class CFX_BreakPiece {
int32_t m_iVerticalScale;
uint32_t m_dwIdentity;
uint32_t m_dwCharStyles;
- CFX_UnownedPtr<std::vector<CFX_Char>> m_pChars;
+ UnownedPtr<std::vector<CFX_Char>> m_pChars;
RetainPtr<CXFA_TextUserData> m_pUserData;
};
diff --git a/xfa/fwl/cfwl_app.h b/xfa/fwl/cfwl_app.h
index 04f140f451..ed47149a56 100644
--- a/xfa/fwl/cfwl_app.h
+++ b/xfa/fwl/cfwl_app.h
@@ -37,7 +37,7 @@ class CFWL_App {
CFWL_NoteDriver* GetNoteDriver() const { return m_pNoteDriver.get(); }
private:
- CFX_UnownedPtr<CXFA_FFApp> const m_pAdapterNative;
+ UnownedPtr<CXFA_FFApp> const m_pAdapterNative;
std::unique_ptr<CFWL_WidgetMgr> m_pWidgetMgr;
std::unique_ptr<CFWL_NoteDriver> m_pNoteDriver;
};
diff --git a/xfa/fwl/cfwl_caret.h b/xfa/fwl/cfwl_caret.h
index 32bc79535a..8a0b54fda0 100644
--- a/xfa/fwl/cfwl_caret.h
+++ b/xfa/fwl/cfwl_caret.h
@@ -51,7 +51,7 @@ class CFWL_Caret : public CFWL_Widget {
const CFX_Matrix* pMatrix);
std::unique_ptr<CFWL_Caret::Timer> m_pTimer;
- CFX_UnownedPtr<CFWL_TimerInfo> m_pTimerInfo;
+ UnownedPtr<CFWL_TimerInfo> m_pTimerInfo;
};
#endif // XFA_FWL_CFWL_CARET_H_
diff --git a/xfa/fwl/cfwl_timer.h b/xfa/fwl/cfwl_timer.h
index 93de009ed1..da1b4437e2 100644
--- a/xfa/fwl/cfwl_timer.h
+++ b/xfa/fwl/cfwl_timer.h
@@ -7,8 +7,8 @@
#ifndef XFA_FWL_CFWL_TIMER_H_
#define XFA_FWL_CFWL_TIMER_H_
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_system.h"
+#include "core/fxcrt/unowned_ptr.h"
class CFWL_TimerInfo;
class CFWL_Widget;
@@ -22,7 +22,7 @@ class CFWL_Timer {
CFWL_TimerInfo* StartTimer(uint32_t dwElapse, bool bImmediately);
protected:
- CFX_UnownedPtr<CFWL_Widget> m_pWidget;
+ UnownedPtr<CFWL_Widget> m_pWidget;
};
#endif // XFA_FWL_CFWL_TIMER_H_
diff --git a/xfa/fwl/cfwl_timerinfo.h b/xfa/fwl/cfwl_timerinfo.h
index ae77ef5d59..c58bcff9a9 100644
--- a/xfa/fwl/cfwl_timerinfo.h
+++ b/xfa/fwl/cfwl_timerinfo.h
@@ -7,8 +7,8 @@
#ifndef XFA_FWL_CFWL_TIMERINFO_H_
#define XFA_FWL_CFWL_TIMERINFO_H_
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_system.h"
+#include "core/fxcrt/unowned_ptr.h"
class IFWL_AdapterTimerMgr;
@@ -20,7 +20,7 @@ class CFWL_TimerInfo {
void StopTimer();
private:
- CFX_UnownedPtr<IFWL_AdapterTimerMgr> m_pMgr;
+ UnownedPtr<IFWL_AdapterTimerMgr> m_pMgr;
};
#endif // XFA_FWL_CFWL_TIMERINFO_H_
diff --git a/xfa/fwl/cfwl_widget.h b/xfa/fwl/cfwl_widget.h
index 16a818e708..f4ff63ea29 100644
--- a/xfa/fwl/cfwl_widget.h
+++ b/xfa/fwl/cfwl_widget.h
@@ -9,9 +9,9 @@
#include <memory>
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_coordinates.h"
#include "core/fxcrt/fx_system.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "xfa/fde/cfde_textout.h"
#include "xfa/fwl/cfwl_event.h"
#include "xfa/fwl/cfwl_themepart.h"
@@ -148,8 +148,8 @@ class CFWL_Widget : public IFWL_WidgetDelegate {
IFWL_ThemeProvider* pTheme,
const CFX_Matrix& pMatrix);
- CFX_UnownedPtr<const CFWL_App> const m_pOwnerApp;
- CFX_UnownedPtr<CFWL_WidgetMgr> const m_pWidgetMgr;
+ UnownedPtr<const CFWL_App> const m_pOwnerApp;
+ UnownedPtr<CFWL_WidgetMgr> const m_pWidgetMgr;
std::unique_ptr<CFWL_WidgetProperties> m_pProperties;
CFWL_Widget* m_pOuter;
int32_t m_iLock;
@@ -184,7 +184,7 @@ class CFWL_Widget : public IFWL_WidgetDelegate {
CXFA_FFWidget* m_pLayoutItem;
uint32_t m_nEventKey;
- CFX_UnownedPtr<IFWL_WidgetDelegate> m_pDelegate;
+ UnownedPtr<IFWL_WidgetDelegate> m_pDelegate;
};
#endif // XFA_FWL_CFWL_WIDGET_H_
diff --git a/xfa/fwl/cfwl_widgetmgr.h b/xfa/fwl/cfwl_widgetmgr.h
index c7e48a1f60..6f6c39a6f9 100644
--- a/xfa/fwl/cfwl_widgetmgr.h
+++ b/xfa/fwl/cfwl_widgetmgr.h
@@ -113,7 +113,7 @@ class CFWL_WidgetMgr {
uint32_t m_dwCapability;
std::map<CFWL_Widget*, std::unique_ptr<Item>> m_mapWidgetItem;
- CFX_UnownedPtr<CXFA_FWLAdapterWidgetMgr> const m_pAdapter;
+ UnownedPtr<CXFA_FWLAdapterWidgetMgr> const m_pAdapter;
#if (_FX_OS_ == _FX_WIN32_DESKTOP_) || (_FX_OS_ == _FX_WIN64_)
CFX_RectF m_rtScreen;
#endif
diff --git a/xfa/fxfa/cxfa_ffapp.h b/xfa/fxfa/cxfa_ffapp.h
index 857e9c03bb..351ba032a0 100644
--- a/xfa/fxfa/cxfa_ffapp.h
+++ b/xfa/fxfa/cxfa_ffapp.h
@@ -12,8 +12,8 @@
#include "core/fpdfapi/parser/cpdf_stream.h"
#include "core/fpdfapi/parser/cpdf_stream_acc.h"
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/retain_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "xfa/fgas/font/cfgas_fontmgr.h"
#include "xfa/fwl/cfwl_app.h"
#include "xfa/fxfa/fxfa.h"
@@ -52,7 +52,7 @@ class CXFA_FFApp {
private:
std::unique_ptr<CXFA_FFDocHandler> m_pDocHandler;
- CFX_UnownedPtr<IXFA_AppProvider> const m_pProvider;
+ UnownedPtr<IXFA_AppProvider> const m_pProvider;
// The fonts stored in the font manager may have been created by the default
// font manager. The GEFont::LoadFont call takes the manager as a param and
diff --git a/xfa/fxfa/cxfa_ffdoc.h b/xfa/fxfa/cxfa_ffdoc.h
index ceec91f7db..c85c951e04 100644
--- a/xfa/fxfa/cxfa_ffdoc.h
+++ b/xfa/fxfa/cxfa_ffdoc.h
@@ -10,7 +10,7 @@
#include <map>
#include <memory>
-#include "core/fxcrt/cfx_unowned_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "xfa/fxfa/fxfa.h"
#include "xfa/fxfa/parser/cxfa_document.h"
#include "xfa/fxfa/parser/cxfa_document_parser.h"
@@ -82,12 +82,12 @@ class CXFA_FFDoc {
bool bXDP = true);
private:
- CFX_UnownedPtr<IXFA_DocEnvironment> const m_pDocEnvironment;
+ UnownedPtr<IXFA_DocEnvironment> const m_pDocEnvironment;
std::unique_ptr<CXFA_DocumentParser> m_pDocumentParser;
RetainPtr<IFX_SeekableStream> m_pStream;
- CFX_UnownedPtr<CXFA_FFApp> m_pApp;
+ UnownedPtr<CXFA_FFApp> m_pApp;
std::unique_ptr<CXFA_FFNotify> m_pNotify;
- CFX_UnownedPtr<CPDF_Document> m_pPDFDoc;
+ UnownedPtr<CPDF_Document> m_pPDFDoc;
std::map<uint32_t, FX_IMAGEDIB_AND_DPI> m_HashToDibDpiMap;
std::unique_ptr<CXFA_FFDocView> m_DocView;
std::unique_ptr<CFGAS_PDFFontMgr> m_pPDFFontMgr;
diff --git a/xfa/fxfa/cxfa_ffdocview.h b/xfa/fxfa/cxfa_ffdocview.h
index 981491c60a..067b41165a 100644
--- a/xfa/fxfa/cxfa_ffdocview.h
+++ b/xfa/fxfa/cxfa_ffdocview.h
@@ -11,7 +11,7 @@
#include <memory>
#include <vector>
-#include "core/fxcrt/cfx_unowned_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "xfa/fxfa/cxfa_eventparam.h"
#include "xfa/fxfa/cxfa_ffdoc.h"
@@ -116,12 +116,12 @@ class CXFA_FFDocView {
bool ResetSingleWidgetAccData(CXFA_WidgetAcc* pWidgetAcc);
CXFA_Node* GetRootSubform();
- CFX_UnownedPtr<CXFA_FFDoc> const m_pDoc;
+ UnownedPtr<CXFA_FFDoc> const m_pDoc;
std::unique_ptr<CXFA_FFWidgetHandler> m_pWidgetHandler;
CXFA_LayoutProcessor* m_pXFADocLayout; // Not owned.
- CFX_UnownedPtr<CXFA_WidgetAcc> m_pFocusAcc;
- CFX_UnownedPtr<CXFA_FFWidget> m_pFocusWidget;
- CFX_UnownedPtr<CXFA_FFWidget> m_pOldFocusWidget;
+ UnownedPtr<CXFA_WidgetAcc> m_pFocusAcc;
+ UnownedPtr<CXFA_FFWidget> m_pFocusWidget;
+ UnownedPtr<CXFA_FFWidget> m_pOldFocusWidget;
std::map<CXFA_FFPageView*, std::unique_ptr<CFX_RectF>> m_mapPageInvalidate;
std::vector<CXFA_WidgetAcc*> m_ValidateAccs;
std::vector<CXFA_WidgetAcc*> m_CalculateAccs;
diff --git a/xfa/fxfa/cxfa_ffnotify.h b/xfa/fxfa/cxfa_ffnotify.h
index 01adc33c1c..0a95e39451 100644
--- a/xfa/fxfa/cxfa_ffnotify.h
+++ b/xfa/fxfa/cxfa_ffnotify.h
@@ -71,7 +71,7 @@ class CXFA_FFNotify {
void SetFocusWidgetNode(CXFA_Node* pNode);
private:
- CFX_UnownedPtr<CXFA_FFDoc> const m_pDoc;
+ UnownedPtr<CXFA_FFDoc> const m_pDoc;
};
#endif // XFA_FXFA_CXFA_FFNOTIFY_H_
diff --git a/xfa/fxfa/cxfa_ffpageview.h b/xfa/fxfa/cxfa_ffpageview.h
index 4e79ad5e3c..f99788505f 100644
--- a/xfa/fxfa/cxfa_ffpageview.h
+++ b/xfa/fxfa/cxfa_ffpageview.h
@@ -31,7 +31,7 @@ class CXFA_FFPageView : public CXFA_ContainerLayoutItem {
uint32_t dwWidgetFilter);
protected:
- CFX_UnownedPtr<CXFA_FFDocView> const m_pDocView;
+ UnownedPtr<CXFA_FFDocView> const m_pDocView;
};
using CXFA_LayoutItemIterator =
@@ -72,7 +72,7 @@ class CXFA_TabParam {
const std::vector<CXFA_FFWidget*>& GetChildren() const { return m_Children; }
private:
- CFX_UnownedPtr<CXFA_FFWidget> const m_pWidget;
+ UnownedPtr<CXFA_FFWidget> const m_pWidget;
std::vector<CXFA_FFWidget*> m_Children;
};
diff --git a/xfa/fxfa/cxfa_ffwidget.h b/xfa/fxfa/cxfa_ffwidget.h
index c743742890..77f6faf499 100644
--- a/xfa/fxfa/cxfa_ffwidget.h
+++ b/xfa/fxfa/cxfa_ffwidget.h
@@ -184,7 +184,7 @@ class CXFA_FFWidget : public CXFA_ContentLayoutItem {
CXFA_FFDocView* m_pDocView;
CXFA_FFPageView* m_pPageView;
- CFX_UnownedPtr<CXFA_WidgetAcc> const m_pDataAcc;
+ UnownedPtr<CXFA_WidgetAcc> const m_pDataAcc;
mutable CFX_RectF m_rtWidget;
};
diff --git a/xfa/fxfa/cxfa_fwltheme.h b/xfa/fxfa/cxfa_fwltheme.h
index 7813545447..bdab7cfdc5 100644
--- a/xfa/fxfa/cxfa_fwltheme.h
+++ b/xfa/fxfa/cxfa_fwltheme.h
@@ -60,7 +60,7 @@ class CXFA_FWLTheme final : public IFWL_ThemeProvider {
std::unique_ptr<CFDE_TextOut> m_pTextOut;
RetainPtr<CFGAS_GEFont> m_pCalendarFont;
WideString m_wsResource;
- CFX_UnownedPtr<CXFA_FFApp> const m_pApp;
+ UnownedPtr<CXFA_FFApp> const m_pApp;
CFX_RectF m_Rect;
};
diff --git a/xfa/fxfa/cxfa_widgetacciterator.h b/xfa/fxfa/cxfa_widgetacciterator.h
index 0ad94260f3..79860a4c4c 100644
--- a/xfa/fxfa/cxfa_widgetacciterator.h
+++ b/xfa/fxfa/cxfa_widgetacciterator.h
@@ -7,7 +7,7 @@
#ifndef XFA_FXFA_CXFA_WIDGETACCITERATOR_H_
#define XFA_FXFA_CXFA_WIDGETACCITERATOR_H_
-#include "core/fxcrt/cfx_unowned_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "xfa/fxfa/parser/cxfa_traversestrategy_xfacontainernode.h"
class CXFA_Node;
@@ -23,7 +23,7 @@ class CXFA_WidgetAccIterator {
private:
CXFA_ContainerIterator m_ContentIterator;
- CFX_UnownedPtr<CXFA_WidgetAcc> m_pCurWidgetAcc;
+ UnownedPtr<CXFA_WidgetAcc> m_pCurWidgetAcc;
};
#endif // XFA_FXFA_CXFA_WIDGETACCITERATOR_H_
diff --git a/xfa/fxfa/fm2js/cxfa_fm2jscontext.h b/xfa/fxfa/fm2js/cxfa_fm2jscontext.h
index ca52ea8271..8d1b33bf81 100644
--- a/xfa/fxfa/fm2js/cxfa_fm2jscontext.h
+++ b/xfa/fxfa/fm2js/cxfa_fm2jscontext.h
@@ -439,7 +439,7 @@ class CXFA_FM2JSContext : public CFXJSE_HostObject {
v8::Isolate* m_pIsolate;
CFXJSE_Class* m_pFMClass;
std::unique_ptr<CFXJSE_Value> m_pValue;
- CFX_UnownedPtr<CXFA_Document> const m_pDocument;
+ UnownedPtr<CXFA_Document> const m_pDocument;
};
#endif // XFA_FXFA_FM2JS_CXFA_FM2JSCONTEXT_H_
diff --git a/xfa/fxfa/parser/cxfa_dataexporter.h b/xfa/fxfa/parser/cxfa_dataexporter.h
index 0820560c87..a2a55b3c13 100644
--- a/xfa/fxfa/parser/cxfa_dataexporter.h
+++ b/xfa/fxfa/parser/cxfa_dataexporter.h
@@ -32,7 +32,7 @@ class CXFA_DataExporter {
uint32_t dwFlag,
const char* pChecksum);
- CFX_UnownedPtr<CXFA_Document> const m_pDocument;
+ UnownedPtr<CXFA_Document> const m_pDocument;
};
#endif // XFA_FXFA_PARSER_CXFA_DATAEXPORTER_H_
diff --git a/xfa/fxfa/parser/cxfa_dataimporter.h b/xfa/fxfa/parser/cxfa_dataimporter.h
index dc7764ccad..ca5896eb55 100644
--- a/xfa/fxfa/parser/cxfa_dataimporter.h
+++ b/xfa/fxfa/parser/cxfa_dataimporter.h
@@ -7,9 +7,9 @@
#ifndef XFA_FXFA_PARSER_CXFA_DATAIMPORTER_H_
#define XFA_FXFA_PARSER_CXFA_DATAIMPORTER_H_
-#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 CXFA_Document;
class IFX_SeekableStream;
@@ -22,7 +22,7 @@ class CXFA_DataImporter {
bool ImportData(const RetainPtr<IFX_SeekableStream>& pDataDocument);
private:
- CFX_UnownedPtr<CXFA_Document> const m_pDocument;
+ UnownedPtr<CXFA_Document> const m_pDocument;
};
#endif // XFA_FXFA_PARSER_CXFA_DATAIMPORTER_H_
diff --git a/xfa/fxfa/parser/cxfa_layoutprocessor.h b/xfa/fxfa/parser/cxfa_layoutprocessor.h
index 360a9df685..e8391bebb9 100644
--- a/xfa/fxfa/parser/cxfa_layoutprocessor.h
+++ b/xfa/fxfa/parser/cxfa_layoutprocessor.h
@@ -10,8 +10,8 @@
#include <memory>
#include <vector>
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_system.h"
+#include "core/fxcrt/unowned_ptr.h"
class CXFA_ContainerLayoutItem;
class CXFA_Document;
@@ -45,7 +45,7 @@ class CXFA_LayoutProcessor {
private:
bool IsNeedLayout();
- CFX_UnownedPtr<CXFA_Document> const m_pDocument;
+ UnownedPtr<CXFA_Document> const m_pDocument;
std::unique_ptr<CXFA_ItemLayoutProcessor> m_pRootItemLayoutProcessor;
std::unique_ptr<CXFA_LayoutPageMgr> m_pLayoutPageMgr;
std::vector<CXFA_Node*> m_rgChangedContainers;
diff --git a/xfa/fxfa/parser/cxfa_nodelocale.h b/xfa/fxfa/parser/cxfa_nodelocale.h
index 5ad0d4c626..6f79e4a65a 100644
--- a/xfa/fxfa/parser/cxfa_nodelocale.h
+++ b/xfa/fxfa/parser/cxfa_nodelocale.h
@@ -45,7 +45,7 @@ class CXFA_NodeLocale : public IFX_Locale {
int index,
bool bAbbr) const;
- CFX_UnownedPtr<CXFA_Node> const m_pLocale;
+ UnownedPtr<CXFA_Node> const m_pLocale;
};
#endif // XFA_FXFA_PARSER_CXFA_NODELOCALE_H_
diff --git a/xfa/fxfa/parser/cxfa_object.h b/xfa/fxfa/parser/cxfa_object.h
index 49442d254d..3e305008b7 100644
--- a/xfa/fxfa/parser/cxfa_object.h
+++ b/xfa/fxfa/parser/cxfa_object.h
@@ -86,7 +86,7 @@ class CXFA_Object : public CFXJSE_HostObject {
protected:
void ThrowException(const wchar_t* str, ...) const;
- CFX_UnownedPtr<CXFA_Document> const m_pDocument;
+ UnownedPtr<CXFA_Document> const m_pDocument;
const XFA_ObjectType m_objectType;
const XFA_Element m_elementType;
diff --git a/xfa/fxfa/parser/cxfa_scriptcontext.h b/xfa/fxfa/parser/cxfa_scriptcontext.h
index d3632e2859..75d30278bd 100644
--- a/xfa/fxfa/parser/cxfa_scriptcontext.h
+++ b/xfa/fxfa/parser/cxfa_scriptcontext.h
@@ -103,7 +103,7 @@ class CXFA_ScriptContext {
void DefineJsClass();
void RemoveBuiltInObjs(CFXJSE_Context* pContext) const;
- CFX_UnownedPtr<CXFA_Document> const m_pDocument;
+ UnownedPtr<CXFA_Document> const m_pDocument;
std::unique_ptr<CFXJSE_Context> m_JsContext;
v8::Isolate* m_pIsolate;
CFXJSE_Class* m_pJsClass;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 01:47:47 +0000