Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1803)

Unified Diff: chrome/renderer/print_web_view_helper.cc

Issue 7822014: Fix the print preview regression bug caused by r98926. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed a typo Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/renderer/print_web_view_helper.cc
diff --git a/chrome/renderer/print_web_view_helper.cc b/chrome/renderer/print_web_view_helper.cc
index 36726eee4667e71193e7de272e489219da218c46..4d7b538349dd613012b3db9e75baed0d8aeaa8a5 100644
--- a/chrome/renderer/print_web_view_helper.cc
+++ b/chrome/renderer/print_web_view_helper.cc
@@ -702,19 +702,32 @@ bool PrintWebViewHelper::CreatePreviewDocument() {
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;
}
@@ -1446,7 +1459,7 @@ void PrintWebViewHelper::PrintPreviewContext::Failed() {
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_++];
}
@@ -1470,6 +1483,10 @@ bool PrintWebViewHelper::PrintPreviewContext::IsLastPageOfPrintReadyMetafile()
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;

Powered by Google App Engine
This is Rietveld 408576698