Cleanup: Slight simplification in the PDFiumEngine dtor.

pdf/pdfium/pdfium_engine.cc

 // Copyright (c) 2012 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 "pdf/pdfium/pdfium_engine.h"
 
 #include <math.h>
 
 #include "base/json/json_writer.h"
 #include "base/logging.h"
@@ skipping 643 matching lines @@
   IFSDK_PAUSE::version = 1;
   IFSDK_PAUSE::user = NULL;
   IFSDK_PAUSE::NeedToPauseNow = Pause_NeedToPauseNow;
 }
 
 PDFiumEngine::~PDFiumEngine() {
   for (size_t i = 0; i < pages_.size(); ++i)
     pages_[i]->Unload();
 
   if (doc_) {
-    if (form_) {
-      FORM_DoDocumentAAction(form_, FPDFDOC_AACTION_WC);
-    }
+    FORM_DoDocumentAAction(form_, FPDFDOC_AACTION_WC);
     FPDF_CloseDocument(doc_);
-    if (form_) {
-      FPDFDOC_ExitFormFillEnvironment(form_);
-    }
+    FPDFDOC_ExitFormFillEnvironment(form_);

[Tom Sepez, 2015/05/15 15:06:31]

Curious about the ordering here, in that the same block in embedder_test.cpp
does the ExitFormFillEnvironment before the CloseDocument.  My intuition would
tell me that the FF env's lifetime should be nested within the document's
lifetime, but I've not actually looked.

[Lei Zhang, 2015/05/15 21:23:09]

It used to be the other way around, but changed here. See the discussion with
Bo:
https://codereview.chromium.org/705823002/diff/60001/pdf/pdfium/pdfium_engine...

Calling FPDFDOC_InitFormFillEnvironment(doc_) does end up creating pointers that
point to |doc_|, but as long as we call FPDFDOC_ExitFormFillEnvironment()
immediately after FPDF_CloseDocument(), there's no opportunity to accidentally
use |doc_|. At least that's how it looks on the master branch.

   }
-
-  if (fpdf_availability_)
-    FPDFAvail_Destroy(fpdf_availability_);
+  FPDFAvail_Destroy(fpdf_availability_);
 
   STLDeleteElements(&pages_);
 }
 
 #ifdef PDF_USE_XFA
 
 //  This is just for testing, needs to be removed later
 #if defined(WIN32)
 #define XFA_TESTFILE(filename) "E:/"#filename
 #else
@@ skipping 3326 matching lines @@
     double* height) {
   FPDF_DOCUMENT doc = FPDF_LoadMemDocument(pdf_buffer, pdf_buffer_size, NULL);
   if (!doc)
     return false;
   bool success = FPDF_GetPageSizeByIndex(doc, page_number, width, height) != 0;
   FPDF_CloseDocument(doc);
   return success;
 }
 
 }  // namespace chrome_pdf