Print Preview: Fixing behavior of event listeners.

chrome/renderer/print_web_view_helper.cc

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 1735d90b7e661e1a46a8eebc778efd4688d310ab..fd2899d9ced176bb88796a680917061e17f2f5eb 100644
--- a/chrome/renderer/print_web_view_helper.cc
+++ b/chrome/renderer/print_web_view_helper.cc
@@ -319,7 +319,7 @@ void PrintWebViewHelper::OnPrintPreview(const DictionaryValue& settings) {
     return;
   }
 
-  if (print_pages_params_->params.preview_request_id != 0 &&
+  if (!print_pages_params_->params.is_first_request &&
       old_print_pages_params_.get() &&
       PrintMsg_Print_Params_IsEqual(*old_print_pages_params_,
                                     *print_pages_params_)) {
@@ -354,8 +354,10 @@ bool PrintWebViewHelper::CreatePreviewDocument() {
   int page_count = print_preview_context_.total_page_count();
   bool is_modifiable = print_preview_context_.IsModifiable();
   int document_cookie = print_pages_params_->params.document_cookie;
+  int preview_request_id = print_pages_params_->params.preview_request_id;
   Send(new PrintHostMsg_DidGetPreviewPageCount(routing_id(), document_cookie,
-                                               page_count, is_modifiable));
+                                               page_count, is_modifiable,
+                                               preview_request_id));
   PreviewPageRendered(printing::INVALID_PAGE_INDEX, NULL);
   return true;
 }
@@ -773,6 +775,11 @@ bool PrintWebViewHelper::UpdatePrintSettings(
   if (!UpdatePrintSettingsRequestId(job_settings, &(settings.params)))
     return false;
 
+  if (!job_settings.GetBoolean(printing::kIsFirstRequest,

[Lei Zhang, 2011/08/06 00:52:57]

Why do we need this check here?

[dpapad, 2011/08/06 01:21:20]

Is this method used from the old print flow? Then, this check should be removed.
I added the check because I saw that it is performed for all other settings.

+                               &(settings.params.is_first_request))) {
+    return false;
+  }
+
   print_pages_params_.reset(new PrintMsg_PrintPages_Params(settings));
   Send(new PrintHostMsg_DidGetDocumentCookie(routing_id(),
                                              settings.params.document_cookie));
@@ -931,6 +938,8 @@ void PrintWebViewHelper::PreviewPageRendered(int page_number,
   }
   preview_page_params.data_size = buf_size;
   preview_page_params.page_number = page_number;
+  preview_page_params.preview_request_id =
+      print_pages_params_->params.preview_request_id;
   Send(new PrintHostMsg_DidPreviewPage(routing_id(), preview_page_params));
 }