Print Preview: Associating preview requests and responses using an identifier

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 360 matching lines @@
   if (old_print_pages_params_.get() &&
       PrintMsg_Print_Params_IsEqual(*old_print_pages_params_,
                                     *print_pages_params_)) {
     PrintHostMsg_DidPreviewDocument_Params preview_params;
     preview_params.reuse_existing_data = true;
     preview_params.data_size = 0;
     preview_params.document_cookie =
         print_pages_params_->params.document_cookie;
     preview_params.expected_pages_count = preview_page_count_;
     preview_params.modifiable = IsModifiable(frame, node);
+    settings.GetInteger("requestID", &preview_params.preview_request_id);

[Lei Zhang, 2011/07/12 22:36:31]

can you put requestID in printing/print_job_constants.h?

[dpapad, 2011/07/12 23:02:11]

Done.

 
     Send(new PrintHostMsg_PagesReadyForPreview(routing_id(), preview_params));
     return;
   }
 
   // Render Pages for preview.
   if (!RenderPagesForPreview(frame, node))
     DidFinishPrinting(FAIL_PREVIEW);
 }
 
@@ skipping 256 matching lines @@
 
 bool PrintWebViewHelper::UpdatePrintSettings(
     const DictionaryValue& job_settings) {
   PrintMsg_PrintPages_Params settings;
   Send(new PrintHostMsg_UpdatePrintSettings(routing_id(),
       print_pages_params_->params.document_cookie, job_settings, &settings));
 
   if (!settings.params.dpi || !settings.params.document_cookie)
     return false;
 
+  if (!job_settings.GetInteger(

[Lei Zhang, 2011/07/12 22:36:31]

You can do this check first before the Send() to fail early without having to
send an IPC to the browser.

I'd also add a NOTREACHED() since this should never fail.

[dpapad, 2011/07/12 23:02:11]

Done.

+      "requestID", &settings.params.preview_request_id)) {
+    return false;
+  }
+
   print_pages_params_.reset(new PrintMsg_PrintPages_Params(settings));
   Send(new PrintHostMsg_DidGetDocumentCookie(routing_id(),
                                              settings.params.document_cookie));
   return true;
 }
 
 bool PrintWebViewHelper::GetPrintSettingsFromUser(WebKit::WebFrame* frame,
                                                   int expected_pages_count,
                                                   bool use_browser_overlays) {
   PrintHostMsg_ScriptedPrint_Params params;
@@ skipping 148 matching lines @@
   Send(new PrintHostMsg_RequestPrintPreview(routing_id()));
 }
 
 bool PrintWebViewHelper::PreviewPageRendered(int page_number) {
   bool cancel = false;
   Send(new PrintHostMsg_DidPreviewPage(routing_id(), page_number, &cancel));
   if (cancel)
     notify_browser_of_print_failure_ = false;
   return !cancel;
 }