Print Preview: Fixing behavior of event listeners.

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 336 matching lines @@
 }
 
 bool PrintWebViewHelper::CreatePreviewDocument() {
   PrintMsg_Print_Params print_params = print_pages_params_->params;
   const std::vector<int>& pages = print_pages_params_->pages;
   if (!print_preview_context_.CreatePreviewDocument(&print_params, pages))
     return false;
   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;
-  Send(new PrintHostMsg_DidGetPreviewPageCount(routing_id(), document_cookie,
-                                               page_count, is_modifiable));
+  int preview_request_id = print_pages_params_->params.preview_request_id;
+  Send(new PrintHostMsg_DidGetPreviewPageCount(
+      routing_id(), document_cookie, page_count, is_modifiable,
+      preview_request_id));
   PreviewPageRendered(printing::INVALID_PAGE_INDEX, NULL);
   return true;
 }
 
 void PrintWebViewHelper::OnContinuePreview(int requested_preview_page_index) {
   // Spurious message. We already finished/cancelled/aborted the print preview.
   if (!print_preview_context_.IsBusy())
     return;
   int page_number;
 #if defined(USE_SKIA)
@@ skipping 555 matching lines @@
     buf_size = metafile->GetDataSize();
     DCHECK_GT(buf_size, 0u);
     if (!CopyMetafileDataToSharedMem(
             metafile, &(preview_page_params.metafile_data_handle))) {
       DidFinishPrinting(FAIL_PREVIEW);
       return;
     }
   }
   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));
 }
 
 PrintWebViewHelper::PrintPreviewContext::PrintPreviewContext()
     : frame_(NULL),
       total_page_count_(0),
       actual_page_count_(0),
       current_page_number_(0),
       state_(UNINITIALIZED) {
 }
@@ skipping 172 matching lines @@
 const gfx::Size&
 PrintWebViewHelper::PrintPreviewContext::GetPrintCanvasSize() const {
   return prep_frame_view_->GetPrintCanvasSize();
 }
 
 void PrintWebViewHelper::PrintPreviewContext::ClearContext() {
   prep_frame_view_.reset();
   metafile_.reset();
   rendered_pages_.clear();
 }