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

chrome/renderer/print_web_view_helper_linux.cc

Index: chrome/renderer/print_web_view_helper_linux.cc
diff --git a/chrome/renderer/print_web_view_helper_linux.cc b/chrome/renderer/print_web_view_helper_linux.cc
index c9d8f38f760d62a07d0485c7312a2a300f5b253a..c67b2e5d6d355326de66adfa0ccf4115653aea81 100644
--- a/chrome/renderer/print_web_view_helper_linux.cc
+++ b/chrome/renderer/print_web_view_helper_linux.cc
@@ -29,19 +29,30 @@ void PrintWebViewHelper::RenderPreviewPage(int page_number) {
   PrintMsg_PrintPage_Params page_params;
   page_params.params = print_preview_context_.print_params();
   page_params.page_number = page_number;
+  scoped_ptr<printing::Metafile> draft_metafile;
+  printing::Metafile* initial_render_metafile =
+      print_preview_context_.metafile();
+  if (print_preview_context_.IsModifiable() &&
+      is_complete_metafile_already_sent_) {
+    DCHECK(print_preview_context_.IsModifiable());

[vandebo (ex-Chrome), 2011/08/04 21:45:02]

nit: With IsModifiable in the the if condition, this DCHECK isn't needed.

[kmadhusu, 2011/08/05 22:55:22]

oops.. my bad. Fixed.

+    draft_metafile.reset(new printing::PreviewMetafile);
+    initial_render_metafile = draft_metafile.get();
+  }
 
   base::TimeTicks begin_time = base::TimeTicks::Now();
   PrintPageInternal(page_params,
                     print_preview_context_.GetPrintCanvasSize(),
-                    print_preview_context_.frame(),
-                    print_preview_context_.metafile());
-
+                    print_preview_context_.frame(), initial_render_metafile);
   print_preview_context_.RenderedPreviewPage(
       base::TimeTicks::Now() - begin_time);
-  printing::Metafile* page_metafile = NULL;
+  printing::Metafile* page_metafile = draft_metafile.get();
   if (print_preview_context_.IsModifiable()) {
-    page_metafile = reinterpret_cast<printing::PreviewMetafile*>(
-        print_preview_context_.metafile())->GetMetafileForCurrentPage();
+    if (is_complete_metafile_already_sent_) {

[vandebo (ex-Chrome), 2011/08/04 21:45:02]

nit: if (page_metafile)

[kmadhusu, 2011/08/05 22:55:22]

Done.

+      page_metafile->FinishDocument();
+    } else {
+      page_metafile = reinterpret_cast<printing::PreviewMetafile*>(
+          initial_render_metafile)->GetMetafileForCurrentPage();
+    }
   }
   PreviewPageRendered(page_number, page_metafile);
 }
@@ -207,6 +218,8 @@ void PrintWebViewHelper::PrintPageInternal(
   SkRefPtr<skia::VectorCanvas> canvas = new skia::VectorCanvas(device);
   canvas->unref();  // SkRefPtr and new both took a reference.
   printing::MetafileSkiaWrapper::SetMetafileOnCanvas(canvas.get(), metafile);
+  bool draft_mode = is_complete_metafile_already_sent_;

[vandebo (ex-Chrome), 2011/08/04 21:45:02]

nit: No need for the variable.

[kmadhusu, 2011/08/05 22:55:22]

Done.

+  printing::MetafileSkiaWrapper::SetDraftMode(canvas.get(), draft_mode);
   frame->printPage(params.page_number, canvas.get());
 
   // TODO(myhuang): We should render the header and the footer.