commit 23bf560507a8e03968e66480281597be9161abf4
author Jun Fang <jun_fang@foxitsoftware.com> Mon Feb 01 20:29:55 2016 -0800
committer Jun Fang <jun_fang@foxitsoftware.com> Mon Feb 01 20:29:55 2016 -0800
tree c33ecb4ae74eb858a35cd1d78f14c46c849b033a
parent 1be28d1b037de32c75632e10e7d2fc758fe7f962

Revert "Fix a crashier in CPDFSDK_Document::GetPageView()"

This reverts commit 1be28d1b037de32c75632e10e7d2fc758fe7f962.

BUG=pdfium:369

TBR=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1659463006 .

fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp

diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp
index 7c2bbf0..d37038d 100644
--- a/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp
+++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp
@@ -45,16 +45,11 @@
 }
 
 CPDFXFA_Document::~CPDFXFA_Document() {
-  if (m_pXFADoc) {
-    IXFA_App* pApp = m_pApp->GetXFAApp();
-    if (pApp) {
-      IXFA_DocHandler* pDocHandler = pApp->GetDocHandler();
-      if (pDocHandler)
-        CloseXFADoc(pDocHandler);
-    }
-    delete m_pXFADoc;
-    m_pXFADoc = nullptr;
-  }
+  if (m_pJSContext && m_pSDKDoc && m_pSDKDoc->GetEnv())
+    m_pSDKDoc->GetEnv()->GetJSRuntime()->ReleaseContext(m_pJSContext);
+
+  delete m_pSDKDoc;
+
   if (m_pPDFDoc) {
     CPDF_Parser* pParser = m_pPDFDoc->GetParser();
     if (pParser)
@@ -62,9 +57,16 @@
     else
       delete m_pPDFDoc;
   }
-  if (m_pJSContext && m_pSDKDoc && m_pSDKDoc->GetEnv())
-    m_pSDKDoc->GetEnv()->GetJSRuntime()->ReleaseContext(m_pJSContext);
-  delete m_pSDKDoc;
+  if (m_pXFADoc) {
+    IXFA_App* pApp = m_pApp->GetXFAApp();
+    if (pApp) {
+      IXFA_DocHandler* pDocHandler = pApp->GetDocHandler();
+      if (pDocHandler) {
+        CloseXFADoc(pDocHandler);
+      }
+    }
+    delete m_pXFADoc;
+  }
 }
 
 FX_BOOL CPDFXFA_Document::LoadXFADoc() {
@@ -485,6 +487,7 @@
   if (!pPage)
     return;
   pPage->SetXFAPageView(nullptr);
+  m_pSDKDoc->GetPageView(pPage)->ClearFXAnnots();
 }
 
 void CPDFXFA_Document::WidgetEvent(IXFA_Widget* hWidget,