Revert 96567 - Reland 96406 - Print preview page selection should not require a rerendering of draft pages.

On page selection, regenerate the complete document with the selection, but preserve the existing draft pages and simply display a subset of them.

1. Added a new param |clear all preview data| to |PrintHostMsg_DidGetPreviewPageCount|.
2. Removed |requested_preview_page_index| from |PrintMsg_ContinuePreview|

Review URL: http://codereview.chromium.org/7544018

Original Commit: http://src.chromium.org/viewvc/chrome?view=rev&revision=96406

Revert Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=96414

BUG=84383
TEST=print preview works after code changes.

Review URL: http://codereview.chromium.org/7628019

TBR=kmadhusu@chromium.org
Review URL: http://codereview.chromium.org/7639023

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96581 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 34 insertions, 53 deletions

diff --git a/chrome/renderer/print_web_view_helper_mac.mm b/chrome/renderer/print_web_view_helper_mac.mm
index 0f46239..95ccb7e 100644
--- a/chrome/renderer/print_web_view_helper_mac.mm
+++ b/chrome/renderer/print_web_view_helper_mac.mm
@@ -66,30 +66,19 @@ void PrintWebViewHelper::RenderPreviewPage(int page_number) {
                          printParams.printable_size.width(),
                          printParams.printable_size.height());
 
-  scoped_ptr<printing::Metafile> draft_metafile;
   printing::Metafile* initial_render_metafile =
       print_preview_context_.metafile();
-
-#if defined(USE_SKIA)
-  bool need_draft_metafile = print_preview_context_.IsModifiable() &&
-                             is_print_ready_metafile_sent_;
-#else
-  bool need_draft_metafile = print_preview_context_.IsModifiable() &&
-                             print_preview_context_.generate_draft_pages();
-  // NOTE: If the rendering page need to be in draft metafile and print ready
-  // metafile, we should always render to the draft metafile first and then
-  // copy that into the print ready metafile because CG does not allow us to do
-  // it in the other order.
-#endif
-
-  if (need_draft_metafile) {
-    draft_metafile.reset(new printing::PreviewMetafile());
+  scoped_ptr<printing::PreviewMetafile> draft_metafile;
+#if !defined(USE_SKIA)
+  if (print_preview_context_.IsModifiable()) {
+    draft_metafile.reset(new printing::PreviewMetafile);
     if (!draft_metafile->Init()) {
       DidFinishPrinting(FAIL_PREVIEW);
       return;
     }
     initial_render_metafile = draft_metafile.get();
   }
+#endif
 
   base::TimeTicks begin_time = base::TimeTicks::Now();
   RenderPage(printParams.page_size, content_area, scale_factor, page_number,
@@ -97,44 +86,38 @@ void PrintWebViewHelper::RenderPreviewPage(int page_number) {
   print_preview_context_.RenderedPreviewPage(
       base::TimeTicks::Now() - begin_time);
 
-  if (draft_metafile.get()) {
-    draft_metafile->FinishDocument();
-#if !defined(USE_SKIA)
-    if (!is_print_ready_metafile_sent_) {
-      // With CG, we rendered into a new metafile so we could get it as a draft
-      // document.  Now we need to add it to print ready document.  But the
-      // document has already been scaled and adjusted for margins, so do a 1:1
-      // drawing.
-      printing::Metafile* print_ready_metafile =
-          print_preview_context_.metafile();
-      bool success = print_ready_metafile->StartPage(
-          printParams.page_size, gfx::Rect(printParams.page_size), 1.0);
-      DCHECK(success);
-      // StartPage unconditionally flips the content over, flip it back since it
-      // was already flipped in |draft_metafile|.
-      CGContextTranslateCTM(print_ready_metafile->context(), 0,
-                            printParams.page_size.height());
-      CGContextScaleCTM(print_ready_metafile->context(), 1.0, -1.0);
-      draft_metafile->RenderPage(1,
-                                 print_ready_metafile->context(),
-                                 draft_metafile->GetPageBounds(1).ToCGRect(),
-                                 false /* shrink_to_fit */,
-                                 false /* stretch_to_fit */,
-                                 true /* center_horizontally */,
-                                 true /* center_vertically */);
-      print_ready_metafile->FinishPage();
-    }
-#endif
-  } else {
+  if (print_preview_context_.IsModifiable()) {
 #if defined(USE_SKIA)
-    if (print_preview_context_.IsModifiable() &&
-        print_preview_context_.generate_draft_pages()) {
-      DCHECK(!draft_metafile.get());
-      draft_metafile.reset(
-          print_preview_context_.metafile()->GetMetafileForCurrentPage());
-    }
+    DCHECK(!draft_metafile.get());
+    draft_metafile.reset(
+        print_preview_context_.metafile()->GetMetafileForCurrentPage());
+#else
+    draft_metafile->FinishDocument();
+
+    // With CG, we rendered into a new metafile so we could get it as a draft
+    // document.  Now we need to add it to complete document.  But the document
+    // has already been scaled and adjusted for margins, so do a 1:1 drawing.
+    printing::Metafile* complete_metafile = print_preview_context_.metafile();
+    bool success = complete_metafile->StartPage(
+        printParams.page_size, gfx::Rect(printParams.page_size), 1.0);
+    DCHECK(success);
+    // StartPage unconditionally flips the content over, flip it back since it
+    // was already flipped in |draft_metafile|.
+    CGContextTranslateCTM(complete_metafile->context(), 0,
+                          printParams.page_size.height());
+    CGContextScaleCTM(complete_metafile->context(), 1.0, -1.0);
+
+    draft_metafile->RenderPage(1,
+                               complete_metafile->context(),
+                               draft_metafile->GetPageBounds(1).ToCGRect(),
+                               false /* shrink_to_fit */,
+                               false /* stretch_to_fit */,
+                               true  /* center_horizontally */,
+                               true  /* center_vertically */);
+    complete_metafile->FinishPage();
 #endif
   }
+
   PreviewPageRendered(page_number, draft_metafile.get());
 }
 
@@ -154,8 +137,6 @@ void PrintWebViewHelper::RenderPage(
     canvas->unref();  // SkRefPtr and new both took a reference.
     WebKit::WebCanvas* canvasPtr = canvas.get();
     printing::MetafileSkiaWrapper::SetMetafileOnCanvas(canvasPtr, metafile);
-    printing::MetafileSkiaWrapper::SetDraftMode(canvasPtr,
-                                                is_print_ready_metafile_sent_);
 #else
     bool success = metafile->StartPage(page_size, content_area, scale_factor);
     DCHECK(success);