PrintPreview: [Cleanup] Remove unwanted function calls.

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 72c7f10bf7d114458c0e74790085931b5a38f6ff..e59ddfada013c78627f04ac41cd3410ff48c8809 100644
--- a/chrome/renderer/print_web_view_helper.cc
+++ b/chrome/renderer/print_web_view_helper.cc
@@ -517,14 +517,8 @@ void PrintWebViewHelper::OnPrintForPrintPreview(
     return;
   }
 
-  scoped_ptr<PrepareFrameAndViewForPrint> prepare;
-  prepare.reset(new PrepareFrameAndViewForPrint(print_pages_params_->params,
-                                                pdf_frame, pdf_element));
-  UpdatePrintableSizeInPrintParameters(pdf_frame, pdf_element, prepare.get(),
-                                       &print_pages_params_->params);
-
   // Render Pages for printing.
-  if (!RenderPagesForPrint(pdf_frame, pdf_element, prepare.get())) {
+  if (!RenderPagesForPrint(pdf_frame, pdf_element)) {
     LOG(ERROR) << "RenderPagesForPrint failed";
     DidFinishPrinting(FAIL_PRINT);
   }
@@ -766,7 +760,7 @@ void PrintWebViewHelper::Print(WebKit::WebFrame* frame,
   }
 
   // Render Pages for printing.
-  if (!RenderPagesForPrint(frame, node, NULL)) {
+  if (!RenderPagesForPrint(frame, node)) {
     LOG(ERROR) << "RenderPagesForPrint failed";
     DidFinishPrinting(FAIL_PRINT);
   }
@@ -838,16 +832,13 @@ bool PrintWebViewHelper::CopyAndPrint(WebKit::WebFrame* web_frame) {
 #if defined(OS_MACOSX) || defined(OS_WIN)
 bool PrintWebViewHelper::PrintPages(const PrintMsg_PrintPages_Params& params,
                                     WebFrame* frame,
-                                    const WebNode& node,
-                                    PrepareFrameAndViewForPrint* prepare) {
+                                    const WebNode& node) {
   PrintMsg_Print_Params print_params = params.params;
   scoped_ptr<PrepareFrameAndViewForPrint> prep_frame_view;
-  if (!prepare) {
-    prep_frame_view.reset(new PrepareFrameAndViewForPrint(print_params, frame,
-                                                          node));
-    prepare = prep_frame_view.get();
-  }
-  UpdatePrintableSizeInPrintParameters(frame, node, prepare, &print_params);
+  prep_frame_view.reset(new PrepareFrameAndViewForPrint(print_params, frame,

[vandebo (ex-Chrome), 2011/11/19 00:02:20]

nit: no ndeed for a scoped_pointer here, a stack object will now work.

[kmadhusu, 2011/11/19 00:20:56]

Done.

+                                                        node));
+  UpdatePrintableSizeInPrintParameters(frame, node, prep_frame_view.get(),
+                                       &print_params);
 
   int page_count = prepare->GetExpectedPageCount();

[vandebo (ex-Chrome), 2011/11/19 00:02:20]

nit: Update var name.

[kmadhusu, 2011/11/19 00:20:56]

oops..my bad..fixed.

   if (!page_count)
@@ -879,7 +870,7 @@ bool PrintWebViewHelper::PrintPages(const PrintMsg_PrintPages_Params& params,
 void PrintWebViewHelper::didStopLoading() {
   PrintMsg_PrintPages_Params* params = print_pages_params_.get();
   DCHECK(params != NULL);
-  PrintPages(*params, print_web_view_->mainFrame(), WebNode(), NULL);
+  PrintPages(*params, print_web_view_->mainFrame(), WebNode());
 }
 
 // static - Not anonymous so that platform implementations can use it.
@@ -1192,14 +1183,13 @@ bool PrintWebViewHelper::GetPrintSettingsFromUser(WebKit::WebFrame* frame,
 
 bool PrintWebViewHelper::RenderPagesForPrint(
     WebKit::WebFrame* frame,
-    const WebKit::WebNode& node,
-    PrepareFrameAndViewForPrint* prepare) {
+    const WebKit::WebNode& node) {
   PrintMsg_PrintPages_Params print_settings = *print_pages_params_;
   if (print_settings.params.selection_only) {
     return CopyAndPrint(frame);
   } else {
     // TODO: Always copy before printing.
-    return PrintPages(print_settings, frame, node, prepare);
+    return PrintPages(print_settings, frame, node);
   }
 }