Print preview page selection should not require a rerendering of draft pages.

chrome/renderer/print_web_view_helper_win.cc

Index: chrome/renderer/print_web_view_helper_win.cc
diff --git a/chrome/renderer/print_web_view_helper_win.cc b/chrome/renderer/print_web_view_helper_win.cc
index 9cd72ece67ff9817f5dae4897f8cb6dcdcbcde7a..89f72b26e474bce108d5c5243fed48c21102fc8e 100644
--- a/chrome/renderer/print_web_view_helper_win.cc
+++ b/chrome/renderer/print_web_view_helper_win.cc
@@ -130,22 +130,31 @@ void PrintWebViewHelper::RenderPreviewPage(int page_number) {
   // |metafile| is needed for RenderPage() below. |metafile| will not take the
   // ownership of |print_preview_context_| metafile.
   scoped_ptr<Metafile> metafile(print_preview_context_.metafile());
+  scoped_ptr<Metafile> draft_metafile;

[vandebo (ex-Chrome), 2011/08/08 20:11:46]

You probably need a rebase.

[kmadhusu, 2011/08/09 22:09:26]

Done.

+
+  if (print_preview_context_.IsModifiable() && is_complete_metafile_sent_)
+    draft_metafile.reset(new printing::PreviewMetafile);
 
   base::TimeTicks begin_time = base::TimeTicks::Now();
   RenderPage(print_params, &scale_factor, page_number, true,
-             print_preview_context_.frame(), &metafile);
+             print_preview_context_.frame(),
+             is_complete_metafile_sent_? &draft_metafile : &metafile);

[vandebo (ex-Chrome), 2011/08/08 20:11:46]

Hmm, this probably needs to be exactly the same condition as the init of
draft_metafile above.  But that is fragile. This will probably make it easier:
http://codereview.chromium.org/7491074/

[kmadhusu, 2011/08/09 22:09:26]

Rebased with your changes and made code changes accordingly.

 
   print_preview_context_.RenderedPreviewPage(
       base::TimeTicks::Now() - begin_time);
 
   // Release since |print_preview_context_| is the real owner.
   metafile.release();
-  printing::Metafile* page_metafile = NULL;
+
   if (print_preview_context_.IsModifiable()) {
-    page_metafile = reinterpret_cast<printing::PreviewMetafile*>(
-        print_preview_context_.metafile())->GetMetafileForCurrentPage();
+    if (draft_metafile.get()) {
+      draft_metafile->FinishDocument();
+    } else if (print_preview_context_.generate_draft_pages()){
+      draft_metafile.reset(reinterpret_cast<printing::PreviewMetafile*>(

[vandebo (ex-Chrome), 2011/08/08 20:11:46]

Add a DCHECK that draf_metafile is empty?

[kmadhusu, 2011/08/09 22:09:26]

Done.

+          print_preview_context_.metafile())->GetMetafileForCurrentPage());
+    }
   }
-  PreviewPageRendered(page_number, page_metafile);
+  PreviewPageRendered(page_number, draft_metafile.get());
 }
 
 void PrintWebViewHelper::RenderPage(
@@ -188,6 +197,8 @@ void PrintWebViewHelper::RenderPage(
   if (is_preview) {
     printing::MetafileSkiaWrapper::SetMetafileOnCanvas(canvas.get(),
                                                        metafile->get());
+    printing::MetafileSkiaWrapper::SetDraftMode(canvas.get(),
+                                                is_complete_metafile_sent_);
   }
 
   float webkit_scale_factor = frame->printPage(page_number, canvas.get());