Fix the print preview regression bug caused by r98926.

chrome/renderer/print_web_view_helper.cc

 // Copyright (c) 2011 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/print_web_view_helper.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 684 matching lines @@
   PrintHostMsg_DidGetPreviewPageCount_Params params;
   params.page_count = print_preview_context_.total_page_count();
   params.is_modifiable = print_preview_context_.IsModifiable();
   params.document_cookie = print_pages_params_->params.document_cookie;
   params.preview_request_id = print_pages_params_->params.preview_request_id;
   params.clear_preview_data = print_preview_context_.generate_draft_pages();
   Send(new PrintHostMsg_DidGetPreviewPageCount(routing_id(), params));
   if (CheckForCancel())
     return false;
 
-  int page_number;
-  while ((page_number = print_preview_context_.GetNextPageNumber()) >= 0) {
+  while (!print_preview_context_.IsFinalPageRendered()) {
+    int page_number = print_preview_context_.GetNextPageNumber();
+    DCHECK(page_number >= 0);
     if (!RenderPreviewPage(page_number))
       return false;
+
     if (CheckForCancel())
       return false;
+
+    // We must call PrepareFrameAndViewForPrint::FinishPrinting() (by way of
+    // print_preview_context_.AllPagesRendered()) before calling
+    // FinalizePrintReadyDocument() when printing a PDF because the plugin
+    // code does not generate output until we call FinishPrinting().  We do not
+    // generate draft pages for PDFs, so IsFinalPageRendered() and
+    // IsLastPageOfPrintReadyMetafile() will be true in the same iteration of
+    // the loop.
+    if (print_preview_context_.IsFinalPageRendered())
+      print_preview_context_.AllPagesRendered();
+
     if (print_preview_context_.IsLastPageOfPrintReadyMetafile()) {
-      // Finished generating preview. Finalize the document.
+      DCHECK(print_preview_context_.IsModifiable() ||
+             print_preview_context_.IsFinalPageRendered());
       if (!FinalizePrintReadyDocument())
         return false;
     }
   }
-  print_preview_context_.AllPagesRendered();
   print_preview_context_.Finished();
   return true;
 }
 
 bool PrintWebViewHelper::FinalizePrintReadyDocument() {
   DCHECK(!is_print_ready_metafile_sent_);
   print_preview_context_.FinalizePrintReadyDocument();
 
   // Get the size of the resulting metafile.
   printing::PreviewMetafile* metafile = print_preview_context_.metafile();
@@ skipping 644 matching lines @@
   }
 
   int selected_page_count = pages.size();
   current_page_index_ = 0;
   print_ready_metafile_page_count_ = selected_page_count;
   pages_to_render_ = pages;
 
   if (selected_page_count == 0) {
     print_ready_metafile_page_count_ = total_page_count_;
     // Render all pages.
-    for (int i = 0; i < total_page_count_; i++)
+    for (int i = 0; i < total_page_count_; ++i)
       pages_to_render_.push_back(i);
   } else if (generate_draft_pages_) {
     int pages_index = 0;
-    for (int i = 0; i < total_page_count_; i++) {
+    for (int i = 0; i < total_page_count_; ++i) {
       if (pages_index < selected_page_count && i == pages[pages_index]) {
         pages_index++;
         continue;
       }
       pages_to_render_.push_back(i);
     }
   }
 
   document_render_time_ = base::TimeDelta();
   begin_time_ = base::TimeTicks::Now();
@@ skipping 42 matching lines @@
 }
 
 void PrintWebViewHelper::PrintPreviewContext::Failed() {
   DCHECK(state_ == INITIALIZED || state_ == RENDERING);
   state_ = INITIALIZED;
   ClearContext();
 }
 
 int PrintWebViewHelper::PrintPreviewContext::GetNextPageNumber() {
   DCHECK_EQ(RENDERING, state_);
-  if ((size_t)(current_page_index_) == pages_to_render_.size())
+  if (IsFinalPageRendered())
     return -1;
   return pages_to_render_[current_page_index_++];
 }
 
 bool PrintWebViewHelper::PrintPreviewContext::IsReadyToRender() const {
   return state_ != UNINITIALIZED;
 }
 
 bool PrintWebViewHelper::PrintPreviewContext::IsModifiable() const {
   // TODO(vandebo) I think this should only return false if the content is a
   // PDF, just because we are printing a particular node does not mean it's
   // a PDF (right?), we should check the mime type of the node.
   if (node())
     return false;
   std::string mime(frame()->dataSource()->response().mimeType().utf8());
   return mime != "application/pdf";
 }
 
 bool PrintWebViewHelper::PrintPreviewContext::IsLastPageOfPrintReadyMetafile()
     const {
   return current_page_index_ == print_ready_metafile_page_count_;
 }
 
+bool  PrintWebViewHelper::PrintPreviewContext::IsFinalPageRendered() const {
+  return static_cast<size_t>(current_page_index_) == pages_to_render_.size();
+}
+
 void PrintWebViewHelper::PrintPreviewContext::set_generate_draft_pages(
     bool generate_draft_pages) {
   generate_draft_pages_ = generate_draft_pages;
 }
 
 WebKit::WebFrame* PrintWebViewHelper::PrintPreviewContext::frame() const {
   return frame_;
 }
 
 WebKit::WebNode* PrintWebViewHelper::PrintPreviewContext::node() const {
@@ skipping 22 matching lines @@
 const gfx::Size&
 PrintWebViewHelper::PrintPreviewContext::GetPrintCanvasSize() const {
   return prep_frame_view_->GetPrintCanvasSize();
 }
 
 void PrintWebViewHelper::PrintPreviewContext::ClearContext() {
   prep_frame_view_.reset();
   metafile_.reset();
   pages_to_render_.clear();
 }