Merge 182959

chrome/renderer/printing/print_web_view_helper_linux.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 "chrome/renderer/printing/print_web_view_helper.h"
 
 #include "base/file_descriptor_posix.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
@@ skipping 74 matching lines @@
   if (printed_pages.empty())
     return false;
 
   PrintMsg_PrintPage_Params page_params;
   page_params.params = params.params;
   for (size_t i = 0; i < printed_pages.size(); ++i) {
     page_params.page_number = printed_pages[i];
     PrintPageInternal(page_params, canvas_size, frame, &metafile);
   }
 
+  // WebKit::printEnd() for PDF should be called before metafile is closed.
+  FinishFramePrinting();
+
   metafile.FinishDocument();
 
   // Get the size of the resulting metafile.
   uint32 buf_size = metafile.GetDataSize();
   DCHECK_GT(buf_size, 0u);
 
 #if defined(OS_CHROMEOS)
   int sequence_number = -1;
   base::FileDescriptor fd;
 
@@ skipping 80 matching lines @@
   }
   RenderPageContent(frame, params.page_number, canvas_area, content_area,
                     scale_factor, canvas.get());
 
   // Done printing. Close the device context to retrieve the compiled metafile.
   if (!metafile->FinishPage())
     NOTREACHED() << "metafile failed";
 }
 
 }  // namespace printing