Printing: Rename some variables in the two different PrintPages() to be more ...

chrome/renderer/print_web_view_helper_linux.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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 "base/file_descriptor_posix.h"
 #include "base/logging.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
 #include "printing/native_metafile.h"
@@ skipping 12 matching lines @@
   printing::NativeMetafile metafile(printing::NativeMetafile::PDF);
   int page_count;
   skia::VectorCanvas* canvas = NULL;
 
   {
     // Hack - when |prep_frame_view| goes out of scope, PrintEnd() gets called.
     // Doing this before closing |metafile| below ensures
     // webkit::ppapi::PluginInstance::PrintEnd() has a valid canvas/metafile to
     // save the final output to. See pepper_plugin_instance.cc for the whole
     // story.
-    PrepareFrameAndViewForPrint prep_frame_view(params.params,
+    ViewMsg_Print_Params printParams = params.params;
+    PrepareFrameAndViewForPrint prep_frame_view(printParams,
                                                 frame,
                                                 frame->view());
     page_count = prep_frame_view.GetExpectedPageCount();
 
     // TODO(myhuang): Send ViewHostMsg_DidGetPrintedPagesCount.
 
     if (page_count == 0)
       return;
 
     metafile.Init();
 
-    ViewMsg_PrintPage_Params print_page_params;
-    print_page_params.params = params.params;
+    ViewMsg_PrintPage_Params page_params;
+    page_params.params = printParams;
     const gfx::Size& canvas_size = prep_frame_view.GetPrintCanvasSize();
     if (params.pages.empty()) {
       for (int i = 0; i < page_count; ++i) {
-        print_page_params.page_number = i;
+        page_params.page_number = i;
         delete canvas;
-        PrintPage(print_page_params, canvas_size, frame, &metafile, &canvas);
+        PrintPage(page_params, canvas_size, frame, &metafile, &canvas);
       }
     } else {
       for (size_t i = 0; i < params.pages.size(); ++i) {
-        print_page_params.page_number = params.pages[i];
+        page_params.page_number = params.pages[i];
         delete canvas;
-        PrintPage(print_page_params, canvas_size, frame, &metafile, &canvas);
+        PrintPage(page_params, canvas_size, frame, &metafile, &canvas);
       }
     }
   }
 
   delete canvas;
   metafile.Close();
 
   int sequence_number = -1;
   // Get the size of the resulting metafile.
   uint32 buf_size = metafile.GetDataSize();
@@ skipping 50 matching lines @@
                                    canvas_size.height());
   frame->printPage(params.page_number, *canvas);
 
   // TODO(myhuang): We should handle transformation for paper margins.
   // TODO(myhuang): We should render the header and the footer.
 
   // Done printing. Close the device context to retrieve the compiled metafile.
   if (!metafile->FinishPage())
     NOTREACHED() << "metafile failed";
 }