Removed old_print_pages_params_

chrome/renderer/printing/print_web_view_helper.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/printing/print_web_view_helper.h"
 
 #include <string>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 37 matching lines @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "webkit/common/webpreferences.h"
 
 namespace printing {
 
 namespace {
 
 enum PrintPreviewHelperEvents {
   PREVIEW_EVENT_REQUESTED,
-  PREVIEW_EVENT_CACHE_HIT,
+  PREVIEW_EVENT_CACHE_HIT,  // Unused
   PREVIEW_EVENT_CREATE_DOCUMENT,
-  PREVIEW_EVENT_NEW_SETTINGS,
+  PREVIEW_EVENT_NEW_SETTINGS,  // Unused
   PREVIEW_EVENT_MAX,
 };
 
 const double kMinDpi = 1.0;
 
 const char kPageLoadScriptFormat[] =
     "document.open(); document.write(%s); document.close();";
 
 const char kPageSetupScriptFormat[] = "setup(%s);";
 
@@ skipping 16 matching lines @@
 #endif  // defined(OS_MACOSX)
 }
 
 bool PrintMsg_Print_Params_IsValid(const PrintMsg_Print_Params& params) {
   return !params.content_size.IsEmpty() && !params.page_size.IsEmpty() &&
          !params.printable_area.IsEmpty() && params.document_cookie &&
          params.desired_dpi && params.max_shrink && params.min_shrink &&
          params.dpi && (params.margin_top >= 0) && (params.margin_left >= 0);
 }
 
-bool PageLayoutIsEqual(const PrintMsg_PrintPages_Params& oldParams,
-                       const PrintMsg_PrintPages_Params& newParams) {
-  return oldParams.params.content_size == newParams.params.content_size &&
-         oldParams.params.printable_area == newParams.params.printable_area &&
-         oldParams.params.page_size == newParams.params.page_size &&
-         oldParams.params.margin_top == newParams.params.margin_top &&
-         oldParams.params.margin_left == newParams.params.margin_left &&
-         oldParams.params.desired_dpi == newParams.params.desired_dpi &&
-         oldParams.params.dpi == newParams.params.dpi;
-}
-
-bool PrintMsg_Print_Params_IsEqual(
-    const PrintMsg_PrintPages_Params& oldParams,
-    const PrintMsg_PrintPages_Params& newParams) {
-  return PageLayoutIsEqual(oldParams, newParams) &&
-         oldParams.params.max_shrink == newParams.params.max_shrink &&
-         oldParams.params.min_shrink == newParams.params.min_shrink &&
-         oldParams.params.selection_only == newParams.params.selection_only &&
-         oldParams.params.supports_alpha_blend ==
-             newParams.params.supports_alpha_blend &&
-         oldParams.pages.size() == newParams.pages.size() &&
-         oldParams.params.print_to_pdf == newParams.params.print_to_pdf &&
-         oldParams.params.print_scaling_option ==
-             newParams.params.print_scaling_option &&
-         oldParams.params.display_header_footer ==
-             newParams.params.display_header_footer &&
-         oldParams.params.date == newParams.params.date &&
-         oldParams.params.title == newParams.params.title &&
-         oldParams.params.url == newParams.params.url &&
-         std::equal(oldParams.pages.begin(), oldParams.pages.end(),
-             newParams.pages.begin()) &&
-         oldParams.params.should_print_backgrounds ==
-             newParams.params.should_print_backgrounds;
-}
-
 PrintMsg_Print_Params GetCssPrintParams(
     WebKit::WebFrame* frame,
     int page_index,
     const PrintMsg_Print_Params& page_params) {
   PrintMsg_Print_Params page_css_params = page_params;
   int dpi = GetDPI(&page_params);
 
   WebKit::WebSize page_size_in_pixels(
       ConvertUnit(page_params.page_size.width(), dpi, kPixelsPerInch),
       ConvertUnit(page_params.page_size.height(), dpi, kPixelsPerInch));
@@ skipping 835 matching lines @@
                            print_preview_context_.source_node(), settings)) {
     if (print_preview_context_.last_error() != PREVIEW_ERROR_BAD_SETTING) {
       Send(new PrintHostMsg_PrintPreviewInvalidPrinterSettings(
           routing_id(), print_pages_params_->params.document_cookie));
       notify_browser_of_print_failure_ = false;  // Already sent.
     }
     DidFinishPrinting(FAIL_PREVIEW);
     return;
   }
 
-  if (!print_pages_params_->params.is_first_request &&
-      old_print_pages_params_.get() &&
-      PrintMsg_Print_Params_IsEqual(*old_print_pages_params_,
-                                    *print_pages_params_)) {
-    UMA_HISTOGRAM_ENUMERATION("PrintPreview.PreviewEvent",
-                              PREVIEW_EVENT_CACHE_HIT, PREVIEW_EVENT_MAX);
-    PrintHostMsg_DidPreviewDocument_Params preview_params;
-    preview_params.reuse_existing_data = true;
-    preview_params.data_size = 0;
-    preview_params.document_cookie =
-        print_pages_params_->params.document_cookie;
-    preview_params.expected_pages_count =
-        print_preview_context_.total_page_count();
-    preview_params.modifiable = print_preview_context_.IsModifiable();
-    preview_params.preview_request_id =
-        print_pages_params_->params.preview_request_id;
-
-    Send(new PrintHostMsg_MetafileReadyForPrinting(routing_id(),
-                                                   preview_params));
-    return;
-  }
-
   // If we are previewing a pdf and the print scaling is disabled, send a
   // message to browser.
   if (print_pages_params_->params.is_first_request &&
       !print_preview_context_.IsModifiable() &&
       print_preview_context_.source_frame()->isPrintScalingDisabledForPlugin(
           print_preview_context_.source_node())) {
     Send(new PrintHostMsg_PrintPreviewScalingDisabled(routing_id()));
   }
 
-  // Always clear |old_print_pages_params_| before rendering the pages.
-  old_print_pages_params_.reset();
   is_print_ready_metafile_sent_ = false;
 
   // PDF printer device supports alpha blending.
   print_pages_params_->params.supports_alpha_blend = true;
 
   bool generate_draft_pages = false;
   if (!settings.GetBoolean(kSettingGenerateDraftData,
                            &generate_draft_pages)) {
     NOTREACHED();
   }
@@ skipping 50 matching lines @@
   if (!print_preview_context_.CreatePreviewDocument(prep_frame_view_.release(),
                                                     pages)) {
     return false;
   }
 
   PageSizeMargins default_page_layout;
   ComputePageLayoutInPointsForCss(print_preview_context_.prepared_frame(), 0,
                                   print_params, ignore_css_margins_, NULL,
                                   &default_page_layout);
 
-  if (!old_print_pages_params_.get() ||
-      !PageLayoutIsEqual(*old_print_pages_params_, *print_pages_params_)) {
-     UMA_HISTOGRAM_ENUMERATION("PrintPreview.PreviewEvent",
-                               PREVIEW_EVENT_NEW_SETTINGS, PREVIEW_EVENT_MAX);
-    bool has_page_size_style = PrintingFrameHasPageSizeStyle(
-        print_preview_context_.prepared_frame(),
-        print_preview_context_.total_page_count());
-    int dpi = GetDPI(&print_params);
+  bool has_page_size_style = PrintingFrameHasPageSizeStyle(
+      print_preview_context_.prepared_frame(),
+      print_preview_context_.total_page_count());
+  int dpi = GetDPI(&print_params);
 
-    gfx::Rect printable_area_in_points(
-        ConvertUnit(print_params.printable_area.x(), dpi, kPointsPerInch),
-        ConvertUnit(print_params.printable_area.y(), dpi, kPointsPerInch),
-        ConvertUnit(print_params.printable_area.width(), dpi, kPointsPerInch),
-        ConvertUnit(print_params.printable_area.height(), dpi, kPointsPerInch));
+  gfx::Rect printable_area_in_points(
+      ConvertUnit(print_params.printable_area.x(), dpi, kPointsPerInch),
+      ConvertUnit(print_params.printable_area.y(), dpi, kPointsPerInch),
+      ConvertUnit(print_params.printable_area.width(), dpi, kPointsPerInch),
+      ConvertUnit(print_params.printable_area.height(), dpi, kPointsPerInch));
 
-    // Margins: Send default page layout to browser process.
-    Send(new PrintHostMsg_DidGetDefaultPageLayout(routing_id(),
-                                                  default_page_layout,
-                                                  printable_area_in_points,
-                                                  has_page_size_style));
-  }
+  // Margins: Send default page layout to browser process.
+  Send(new PrintHostMsg_DidGetDefaultPageLayout(routing_id(),
+                                                default_page_layout,
+                                                printable_area_in_points,
+                                                has_page_size_style));
 
   PrintHostMsg_DidGetPreviewPageCount_Params params;
   params.page_count = print_preview_context_.total_page_count();
   params.is_modifiable = print_preview_context_.IsModifiable();
   params.document_cookie = print_params.document_cookie;
   params.preview_request_id = print_params.preview_request_id;
   params.clear_preview_data = print_preview_context_.generate_draft_pages();
   Send(new PrintHostMsg_DidGetPreviewPageCount(routing_id(), params));
   if (CheckForCancel())
     return false;
@@ skipping 150 matching lines @@
 
   // Render Pages for printing.
   if (!RenderPagesForPrint(frame_ref.GetFrame(), node)) {
     LOG(ERROR) << "RenderPagesForPrint failed";
     DidFinishPrinting(FAIL_PRINT);
   }
   ResetScriptedPrintCount();
 }
 
 void PrintWebViewHelper::DidFinishPrinting(PrintingResult result) {
-  bool store_print_pages_params = true;
   switch (result) {
     case OK:
       break;
 
     case FAIL_PRINT_INIT:
       DCHECK(!notify_browser_of_print_failure_);
       break;
 
     case FAIL_PRINT:
       if (notify_browser_of_print_failure_ && print_pages_params_.get()) {
         int cookie = print_pages_params_->params.document_cookie;
         Send(new PrintHostMsg_PrintingFailed(routing_id(), cookie));
       }
       break;
 
     case FAIL_PREVIEW:
       DCHECK(is_preview_enabled_);
-      store_print_pages_params = false;
       int cookie = print_pages_params_.get() ?
           print_pages_params_->params.document_cookie : 0;
       if (notify_browser_of_print_failure_) {
         LOG(ERROR) << "CreatePreviewDocument failed";
         Send(new PrintHostMsg_PrintPreviewFailed(routing_id(), cookie));
       } else {
         Send(new PrintHostMsg_PrintPreviewCancelled(routing_id(), cookie));
       }
       print_preview_context_.Failed(notify_browser_of_print_failure_);
       break;
   }
-
   prep_frame_view_.reset();
-
-  if (store_print_pages_params) {
-    old_print_pages_params_.reset(print_pages_params_.release());
-  } else {
-    print_pages_params_.reset();
-    old_print_pages_params_.reset();
-  }
-
+  print_pages_params_.reset();
   notify_browser_of_print_failure_ = true;
 }
 
 void PrintWebViewHelper::OnFramePreparedForPrintPages() {
   PrintPages();
   FinishFramePrinting();
 }
 
 void PrintWebViewHelper::PrintPages() {
   if (!prep_frame_view_)  // Printing is already canceled or failed.
@@ skipping 366 matching lines @@
   if (is_scripted_preview_delayed_) {
     is_scripted_preview_delayed_ = false;
     Send(new PrintHostMsg_ShowScriptedPrintPreview(routing_id(),
             print_preview_context_.IsModifiable()));
   }
 }
 
 void PrintWebViewHelper::RequestPrintPreview(PrintPreviewRequestType type) {
   const bool is_modifiable = print_preview_context_.IsModifiable();
   const bool has_selection = print_preview_context_.HasSelection();
-  old_print_pages_params_.reset();
   PrintHostMsg_RequestPrintPreview_Params params;
   params.is_modifiable = is_modifiable;
   params.has_selection = has_selection;
   switch (type) {
     case PRINT_PREVIEW_SCRIPTED: {
       // Shows scripted print preview in two stages.
       // 1. PrintHostMsg_SetupScriptedPrintPreview blocks this call and JS by
       //    pumping messages here.
       // 2. PrintHostMsg_ShowScriptedPrintPreview shows preview once the
       //    document has been loaded.
@@ skipping 321 matching lines @@
 }
 
 void PrintWebViewHelper::PrintPreviewContext::ClearContext() {
   prep_frame_view_.reset();
   metafile_.reset();
   pages_to_render_.clear();
   error_ = PREVIEW_ERROR_NONE;
 }
 
 }  // namespace printing