Reland of Remove pageview from map immediately

fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h"
 
 #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
@@ skipping 485 matching lines @@
     return;
 
   CXFA_FFPageView* pPageView = hWidget->GetPageView();
   if (!pPageView)
     return;
 
   CPDFXFA_Page* pXFAPage = GetPage(pPageView);
   if (!pXFAPage)
     return;
 
-  m_pSDKDoc->GetPageView(pXFAPage)->AddAnnot(hWidget);
+  m_pSDKDoc->GetPageView(pXFAPage, true)->AddAnnot(hWidget);
 }
 
 void CPDFXFA_Document::WidgetPreRemove(CXFA_FFWidget* hWidget,
                                        CXFA_WidgetAcc* pWidgetData) {
   if (m_iDocType != DOCTYPE_DYNAMIC_XFA || !hWidget)
     return;
 
   CXFA_FFPageView* pPageView = hWidget->GetPageView();
   if (!pPageView)
     return;
 
   CPDFXFA_Page* pXFAPage = GetPage(pPageView);
   if (!pXFAPage)
     return;
 
-  CPDFSDK_PageView* pSdkPageView = m_pSDKDoc->GetPageView(pXFAPage);
+  CPDFSDK_PageView* pSdkPageView = m_pSDKDoc->GetPageView(pXFAPage, true);
   if (CPDFSDK_Annot* pAnnot = pSdkPageView->GetAnnotByXFAWidget(hWidget))
     pSdkPageView->DeleteAnnot(pAnnot);
 }
 
 FX_BOOL CPDFXFA_Document::RenderCustomWidget(CXFA_FFWidget* hWidget,
                                              CFX_Graphics* pGS,
                                              CFX_Matrix* pMatrix,
                                              const CFX_RectF& rtUI) {
   return FALSE;
 }
@@ skipping 742 matching lines @@
 
   return m_pSDKDoc->GetEnv()->GetJSRuntime()->GetValueByName(szPropName,
                                                              pValue);
 }
 
 CPDF_Document* CPDFXFA_Document::OpenPDF(CXFA_FFDoc* hDoc,
                                          IFX_FileRead* pFile,
                                          FX_BOOL bTakeOverFile) {
   return nullptr;
 }