Simplify PDFiumEngine::GetFlattenedPrintData().

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 <stddef.h>
 #include <stdint.h>
 
@@ skipping 1425 matching lines @@
     FPDF_CopyViewerPreferences(output_doc, doc_);
     FitContentsToPrintableAreaIfRequired(output_doc, print_settings);
     // Now flatten all the output pages.
     buffer = GetFlattenedPrintData(output_doc);
   }
   FPDF_CloseDocument(output_doc);
   return buffer;
 }
 
 pp::Buffer_Dev PDFiumEngine::GetFlattenedPrintData(const FPDF_DOCUMENT& doc) {
+  pp::Buffer_Dev buffer;
   int page_count = FPDF_GetPageCount(doc);
-  bool flatten_succeeded = true;
   for (int i = 0; i < page_count; ++i) {
     FPDF_PAGE page = FPDF_LoadPage(doc, i);
     DCHECK(page);
-    if (page) {
-      int flatten_ret = FPDFPage_Flatten(page, FLAT_PRINT);
-      FPDF_ClosePage(page);
-      if (flatten_ret == FLATTEN_FAIL) {
-        flatten_succeeded = false;
-        break;
-      }
-    } else {
-      flatten_succeeded = false;
-      break;
-    }
-  }
-  if (!flatten_succeeded) {
-    FPDF_CloseDocument(doc);

[Lei Zhang, 2015/12/24 08:00:56]

No need, all the callers do it.

-    return pp::Buffer_Dev();
+    if (!page)
+      return buffer;

[raymes, 2016/01/04 00:19:56]

I think we should probably remove the if (!page) check or else remove the DCHECK
above it, as per
https://www.chromium.org/developers/coding-style#TOC-CHECK-DCHECK-and-NOTREAC...

[Lei Zhang, 2016/01/04 20:03:03]

Done.

+
+    int flatten_ret = FPDFPage_Flatten(page, FLAT_PRINT);
+    FPDF_ClosePage(page);
+    if (flatten_ret == FLATTEN_FAIL)
+      return buffer;
   }
 
-  pp::Buffer_Dev buffer;
   PDFiumMemBufferFileWrite output_file_write;
   if (FPDF_SaveAsCopy(doc, &output_file_write, 0)) {
     buffer = pp::Buffer_Dev(
         client_->GetPluginInstance(), output_file_write.size());
     if (!buffer.is_null()) {
       memcpy(buffer.data(), output_file_write.buffer().c_str(),
              output_file_write.size());
     }
   }
   return buffer;
@@ skipping 2520 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