2 files changed, 10 insertions, 11 deletions
diff --git a/xfa/fxfa/cxfa_ffdoc.cpp b/xfa/fxfa/cxfa_ffdoc.cpp
index f7bad38934..bde40ce11f 100644
--- a/xfa/fxfa/cxfa_ffdoc.cpp
+++ b/xfa/fxfa/cxfa_ffdoc.cpp
@@ -337,10 +337,6 @@ void CXFA_FFDoc::CloseDoc() {
   m_pApp->ClearEventTargets();
 }
 
-CPDF_Document* CXFA_FFDoc::GetPDFDoc() {
-  return m_pPDFDoc;
-}
-
 CFX_RetainPtr<CFX_DIBitmap> CXFA_FFDoc::GetPDFNamedImage(
     const CFX_WideStringC& wsName,
     int32_t& iImageXDpi,
diff --git a/xfa/fxfa/cxfa_ffdoc.h b/xfa/fxfa/cxfa_ffdoc.h
index d40e7ba0c8..a43dae3caa 100644
--- a/xfa/fxfa/cxfa_ffdoc.h
+++ b/xfa/fxfa/cxfa_ffdoc.h
@@ -10,6 +10,7 @@
 #include <map>
 #include <memory>
 
+#include "core/fxcrt/cfx_unowned_ptr.h"
 #include "xfa/fxfa/fxfa.h"
 #include "xfa/fxfa/parser/cxfa_document.h"
 #include "xfa/fxfa/parser/cxfa_document_parser.h"
@@ -49,7 +50,9 @@ class CXFA_FFDoc {
   CXFA_FFDoc(CXFA_FFApp* pApp, IXFA_DocEnvironment* pDocEnvironment);
   ~CXFA_FFDoc();
 
-  IXFA_DocEnvironment* GetDocEnvironment() const { return m_pDocEnvironment; }
+  IXFA_DocEnvironment* GetDocEnvironment() const {
+    return m_pDocEnvironment.Get();
+  }
   XFA_DocType GetDocType() const { return m_dwDocType; }
 
   int32_t StartLoad();
@@ -62,11 +65,11 @@ class CXFA_FFDoc {
   bool OpenDoc(CPDF_Document* pPDFDoc);
   void CloseDoc();
 
-  CXFA_Document* GetXFADoc() { return m_pDocumentParser->GetDocument(); }
-  CXFA_FFApp* GetApp() { return m_pApp; }
+  CXFA_Document* GetXFADoc() const { return m_pDocumentParser->GetDocument(); }
+  CXFA_FFApp* GetApp() const { return m_pApp.Get(); }
+  CPDF_Document* GetPDFDoc() const { return m_pPDFDoc.Get(); }
   CXFA_FFDocView* GetDocView(CXFA_LayoutProcessor* pLayout);
   CXFA_FFDocView* GetDocView();
-  CPDF_Document* GetPDFDoc();
   CFX_RetainPtr<CFX_DIBitmap> GetPDFNamedImage(const CFX_WideStringC& wsName,
                                                int32_t& iImageXDpi,
                                                int32_t& iImageYDpi);
@@ -78,12 +81,12 @@ class CXFA_FFDoc {
                   bool bXDP = true);
 
  private:
-  IXFA_DocEnvironment* const m_pDocEnvironment;
+  CFX_UnownedPtr<IXFA_DocEnvironment> const m_pDocEnvironment;
   std::unique_ptr<CXFA_DocumentParser> m_pDocumentParser;
   CFX_RetainPtr<IFX_SeekableStream> m_pStream;
-  CXFA_FFApp* m_pApp;
+  CFX_UnownedPtr<CXFA_FFApp> m_pApp;
   std::unique_ptr<CXFA_FFNotify> m_pNotify;
-  CPDF_Document* m_pPDFDoc;
+  CFX_UnownedPtr<CPDF_Document> m_pPDFDoc;
   std::map<uint32_t, FX_IMAGEDIB_AND_DPI> m_HashToDibDpiMap;
   std::unique_ptr<CXFA_FFDocView> m_DocView;
   XFA_DocType m_dwDocType;