Merge 165517 - Code cleanup. No functional changes.

chrome/renderer/print_web_view_helper_win.cc

 // Copyright (c) 2012 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 "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/process_util.h"
@@ skipping 72 matching lines @@
   page_params.content_area = content_area_in_dpi;
 
   if (!CopyMetafileDataToSharedMem(metafile.get(),
                                    &(page_params.metafile_data_handle))) {
     page_params.data_size = 0;
   }
 
   Send(new PrintHostMsg_DidPrintPage(routing_id(), page_params));
 }
 
-bool PrintWebViewHelper::RenderPreviewPage(int page_number) {
-  PrintMsg_Print_Params print_params = print_preview_context_.print_params();
+bool PrintWebViewHelper::RenderPreviewPage(
+    int page_number,
+    const PrintMsg_Print_Params& print_params) {
   // Calculate the dpi adjustment.
   double actual_shrink = static_cast<float>(print_params.desired_dpi /
                                             print_params.dpi);
   scoped_ptr<Metafile> draft_metafile;
   printing::Metafile* initial_render_metafile =
       print_preview_context_.metafile();
 
   if (print_preview_context_.IsModifiable() && is_print_ready_metafile_sent_) {
     draft_metafile.reset(new printing::PreviewMetafile);
     initial_render_metafile = draft_metafile.get();
@@ skipping 76 matching lines @@
     skia::SetIsPreviewMetafile(*canvas, is_preview);
   }
 
   float webkit_scale_factor = frame->printPage(page_number, canvas.get());
 
   if (params.display_header_footer) {
     // |page_number| is 0-based, so 1 is added.
     PrintHeaderAndFooter(canvas.get(), page_number + 1,
                          print_preview_context_.total_page_count(),
                          css_scale_factor * webkit_page_shrink_factor,
-                         page_layout_in_points,
-                         *header_footer_info_);
+                         page_layout_in_points, *header_footer_info_, params);
   }
 
   if (*actual_shrink <= 0 || webkit_scale_factor <= 0) {
     NOTREACHED() << "Printing page " << page_number << " failed.";
   } else {
     // While rendering certain plugins (PDF) to metafile, we might need to
     // set custom scale factor. Update |actual_shrink| with custom scale
     // if it is set on canvas.
     // TODO(gene): We should revisit this solution for the next versions.
     // Consider creating metafile of the right size (or resizable)
@@ skipping 31 matching lines @@
     shared_buf.Unmap();
     return false;
   }
   shared_buf.GiveToProcess(base::GetCurrentProcessHandle(), shared_mem_handle);
   shared_buf.Unmap();
 
   Send(new PrintHostMsg_DuplicateSection(routing_id(), *shared_mem_handle,
                                          shared_mem_handle));
   return true;
 }