Remove ownership of CPDFSDK_Document from CPDFXFA_Document

samples/pdfium_test.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <map>
@@ skipping 68 matching lines @@
 
 struct AvailDeleter {
   inline void operator()(FPDF_AVAIL avail) const { FPDFAvail_Destroy(avail); }
 };
 
 static FPDF_FORMFILLINFO_PDFiumTest* ToPDFiumTestFormFillInfo(
     FPDF_FORMFILLINFO* formFillInfo) {
   return static_cast<FPDF_FORMFILLINFO_PDFiumTest*>(formFillInfo);
 }
 
 static void CloseDocAndForm(FPDF_DOCUMENT doc, FPDF_FORMHANDLE form) {

[Lei Zhang, 2016/10/05 17:14:54]

If we end up here, just remove CloseDocAndForm() inline the two calls.

[dsinclair, 2016/10/05 17:55:57]

Done.

-#ifdef PDF_ENABLE_XFA
-  // Note: The shut down order here is the reverse of the non-XFA branch order.
-  // Need to work out if this is required, and if it is, the lifetimes of
-  // objects owned by |doc| that |form| reference.
-  FPDF_CloseDocument(doc);
-  FPDFDOC_ExitFormFillEnvironment(form);
-#else   // PDF_ENABLE_XFA
   FPDFDOC_ExitFormFillEnvironment(form);
   FPDF_CloseDocument(doc);
-#endif  // PDF_ENABLE_XFA
 }
 
 static bool CheckDimensions(int stride, int width, int height) {
   if (stride < 0 || width < 0 || height < 0)
     return false;
   if (height > 0 && width > INT_MAX / height)
     return false;
   return true;
 }
 
@@ skipping 823 matching lines @@
   delete platform;
 
 #ifdef V8_USE_EXTERNAL_STARTUP_DATA
   free(const_cast<char*>(natives.data));
   free(const_cast<char*>(snapshot.data));
 #endif  // V8_USE_EXTERNAL_STARTUP_DATA
 #endif  // PDF_ENABLE_V8
 
   return 0;
 }