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

chrome/renderer/print_web_view_helper.h

Index: chrome/renderer/print_web_view_helper.h
diff --git a/chrome/renderer/print_web_view_helper.h b/chrome/renderer/print_web_view_helper.h
index 8b4342dd672b34fe99e3235123da0f9b630870fc..6a49b7849ab4a7182b1357523ad4576256221f9f 100644
--- a/chrome/renderer/print_web_view_helper.h
+++ b/chrome/renderer/print_web_view_helper.h
@@ -6,7 +6,6 @@
 #define CHROME_RENDERER_PRINT_WEB_VIEW_HELPER_H_
 #pragma once
 
-#include <utility>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
@@ -135,10 +134,8 @@ class PrintWebViewHelper : public RenderViewObserver,
   // Initialize the print preview document.
   bool CreatePreviewDocument();
 
-  // Continue generating the print preview. |requested_preview_page_index|
-  // specifies the browser requested preview page index. It is 1-based or
-  // |printing::INVALID_PAGE_INDEX| to continue with next page.
-  void OnContinuePreview(int requested_preview_page_index);
+  // Continue generating the print preview.
+  void OnContinuePreview();
   // Renders a print preview page. |page_number| is 0-based.
   void RenderPreviewPage(int page_number);
   // Finalize the print preview document.
@@ -293,6 +290,7 @@ class PrintWebViewHelper : public RenderViewObserver,
 
   scoped_ptr<PrintMsg_PrintPages_Params> print_pages_params_;
   bool is_preview_;
+  bool is_complete_metafile_already_sent_;
 
   // Used for scripted initiated printing blocking.
   base::Time last_cancelled_script_print_;
@@ -327,7 +325,7 @@ class PrintWebViewHelper : public RenderViewObserver,
     void RenderedPreviewPage(const base::TimeDelta& page_time);
 
     // Finalizes the print preview document.
-    void FinalizePreviewDocument();
+    void FinalizePreviewDocument(bool is_complete_metafile_already_sent);
 
     // Cleanup after print preview finishes.
     void Finished();
@@ -340,6 +338,14 @@ class PrintWebViewHelper : public RenderViewObserver,
     bool IsReadyToRender() const;
     bool IsBusy() const;
     bool IsModifiable() const;
+    bool IsCompleteMetafileReady() const;
+
+    void set_generate_draft_pages(bool generate_draft_pages) {
+      generate_draft_pages_ = generate_draft_pages;
+    }
+    bool get_generate_draft_pages() {
+      return generate_draft_pages_;
+    }
 
     // Return the page slot in the final document for |page_number|. i.e. if
     // the user selected just page 3, the page slot would be 0, since it is
@@ -376,16 +382,17 @@ class PrintWebViewHelper : public RenderViewObserver,
     // Total page count in the renderer.
     int total_page_count_;
 
-    // Number of pages to render.
-    int actual_page_count_;
+    // Requested preview page index list.
+    std::vector<int> render_page_index_list_;
+
+    // True, when draft pages needs to be generated.
+    bool generate_draft_pages_;
 
-    // The current page to render.
-    int current_page_number_;
+    // Specifies the total number of pages in complete metafile.
+    int complete_metafile_page_count_;
 
-    // |rendered_pages_| tracks which pages need to be printed as well as
-    // the page slot it should be printed in. See GetPageSlotForPage.
-    typedef std::pair<bool, int> PreviewPageInfo;
-    std::vector<PreviewPageInfo> rendered_pages_;
+    // Specifies the current preview page index.
+    int current_page_index_;
 
     base::TimeDelta document_render_time_;
     base::TimeTicks begin_time_;