Next round of XFA changes to match master

fpdfsdk/src/fpdfformfill.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 "../../public/fpdf_formfill.h"
 #include "../../public/fpdfview.h"
+#include "../../third_party/base/nonstd_unique_ptr.h"
 #include "../include/fsdk_define.h"
+#include "../include/fsdk_mgr.h"
 #include "../include/fpdfxfa/fpdfxfa_doc.h"
-#include "../include/fsdk_mgr.h"
 #include "../include/fpdfxfa/fpdfxfa_page.h"
 #include "../include/fpdfxfa/fpdfxfa_app.h"
 
 #include "../include/javascript/IJavaScript.h"
 
 namespace {
 
 CPDFSDK_Document* FormHandleToSDKDoc(FPDF_FORMHANDLE hHandle) {
   CPDFDoc_Environment* pEnv = (CPDFDoc_Environment*)hHandle;
   return pEnv ? pEnv->GetSDKDocument() : nullptr;
@@ skipping 292 matching lines @@
     options.m_ForeColor = 0;
     options.m_BackColor = 0xffffff;
   }
   options.m_AddFlags = flags >> 8;
   options.m_pOCContext = new CPDF_OCContext(pPDFDoc);
 
   if (CPDFSDK_PageView* pPageView = pFXDoc->GetPageView((CPDFXFA_Page*)page))
     pPageView->PageView_OnDraw(pDevice.get(), &matrix, &options, &clip);
 
   pDevice->RestoreState();
-
   delete options.m_pOCContext;
   options.m_pOCContext = NULL;
 }
 DLLEXPORT void STDCALL FPDF_Widget_Undo(FPDF_DOCUMENT document,
                                         FPDF_WIDGET hWidget) {
   if (NULL == hWidget || NULL == document)
     return;
 
   CPDFXFA_Document* pDocument = (CPDFXFA_Document*)document;
   if (pDocument->GetDocType() != XFA_DOCTYPE_Dynamic &&
@@ skipping 340 matching lines @@
       }
     } else {
       bExistCAAction = aa.ActionExist(CPDF_AAction::ClosePage);
       if (bExistCAAction) {
         CPDF_Action action = aa.GetAction(CPDF_AAction::ClosePage);
         pActionHandler->DoAction_Page(action, CPDF_AAction::ClosePage, pSDKDoc);
       }
     }
   }
 }