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

2 files changed, 17 insertions, 16 deletions

diff --git a/chrome/browser/printing/print_preview_message_handler.cc b/chrome/browser/printing/print_preview_message_handler.cc
index e853e81..11be054 100644
--- a/chrome/browser/printing/print_preview_message_handler.cc
+++ b/chrome/browser/printing/print_preview_message_handler.cc
@@ -82,11 +82,9 @@ void PrintPreviewMessageHandler::OnRequestPrintPreview() {
   PrintPreviewTabController::PrintPreview(tab_contents());
 }
 
-void PrintPreviewMessageHandler::OnDidGetPreviewPageCount(
-    int document_cookie,
-    int page_count,
-    bool is_modifiable,
-    bool clear_preview_data) {
+void PrintPreviewMessageHandler::OnDidGetPreviewPageCount(int document_cookie,
+                                                          int page_count,
+                                                          bool is_modifiable) {
   if (page_count <= 0)
     return;
 
@@ -96,10 +94,6 @@ void PrintPreviewMessageHandler::OnDidGetPreviewPageCount(
 
   PrintPreviewUI* print_preview_ui =
       static_cast<PrintPreviewUI*>(print_preview_tab->web_ui());
-
-  if (!is_modifiable || clear_preview_data)
-    print_preview_ui->ClearAllPreviewData();
-
   print_preview_ui->OnDidGetPreviewPageCount(
       document_cookie, page_count, is_modifiable);
 }
@@ -125,7 +119,12 @@ void PrintPreviewMessageHandler::OnDidPreviewPage(
     return;
   }
 
+  int requested_preview_page_index = INVALID_PAGE_INDEX;
   int page_number = params.page_number;
+
+  if (page_number == FIRST_PAGE_INDEX)
+    print_preview_ui->ClearAllPreviewData();
+
   if (page_number >= FIRST_PAGE_INDEX && params.data_size) {
     RefCountedBytes* data_bytes =
         GetDataFromHandle(params.metafile_data_handle, params.data_size);
@@ -133,12 +132,15 @@ void PrintPreviewMessageHandler::OnDidPreviewPage(
 
     print_preview_ui->SetPrintPreviewDataForIndex(page_number, data_bytes);
     print_preview_ui->OnDidPreviewPage(page_number);
+    // TODO(kmadhusu): Query |PrintPreviewUI| and update
+    // |requested_preview_page_index| accordingly.
   }
 
-  rvh->Send(new PrintMsg_ContinuePreview(rvh->routing_id()));
+  rvh->Send(new PrintMsg_ContinuePreview(rvh->routing_id(),
+                                         requested_preview_page_index));
 }
 
-void PrintPreviewMessageHandler::OnMetafileReadyForPrinting(
+void PrintPreviewMessageHandler::OnPagesReadyForPreview(
     const PrintHostMsg_DidPreviewDocument_Params& params) {
   StopWorker(params.document_cookie);
 
@@ -216,8 +218,8 @@ bool PrintPreviewMessageHandler::OnMessageReceived(
                         OnDidGetPreviewPageCount)
     IPC_MESSAGE_HANDLER(PrintHostMsg_DidPreviewPage,
                         OnDidPreviewPage)
-    IPC_MESSAGE_HANDLER(PrintHostMsg_MetafileReadyForPrinting,
-                        OnMetafileReadyForPrinting)
+    IPC_MESSAGE_HANDLER(PrintHostMsg_PagesReadyForPreview,
+                        OnPagesReadyForPreview)
     IPC_MESSAGE_HANDLER(PrintHostMsg_PrintPreviewFailed,
                         OnPrintPreviewFailed)
     IPC_MESSAGE_UNHANDLED(handled = false)
diff --git a/chrome/browser/printing/print_preview_message_handler.h b/chrome/browser/printing/print_preview_message_handler.h
index cd056e7..ff56b01 100644
--- a/chrome/browser/printing/print_preview_message_handler.h
+++ b/chrome/browser/printing/print_preview_message_handler.h
@@ -33,11 +33,10 @@ class PrintPreviewMessageHandler : public TabContentsObserver {
   void OnRequestPrintPreview();
   void OnDidGetPreviewPageCount(int document_cookie,
                                 int page_count,
-                                bool is_modifiable,
-                                bool clear_preview_data);
+                                bool is_modifiable);
   // |page_number| is 0-based.
   void OnDidPreviewPage(const PrintHostMsg_DidPreviewPage_Params& params);
-  void OnMetafileReadyForPrinting(
+  void OnPagesReadyForPreview(
       const PrintHostMsg_DidPreviewDocument_Params& params);
   void OnPrintPreviewFailed(int document_cookie);