Page range comparisons should use document size.

chrome/browser/resources/print_preview/preview_generator.js

 // 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.
 
 cr.define('print_preview', function() {
   'use strict';
 
   /**
    * Interface to the Chromium print preview generator.
    * @param {!print_preview.DestinationStore} destinationStore Used to get the
@@ skipping 59 matching lines @@
     this.isColorEnabled_ = false;
 
     /**
      * Whether the document should be fitted to the page.
      * @type {boolean}
      * @private
      */
     this.isFitToPageEnabled_ = false;
 
     /**
-     * Page number set used to generate the last preview.
-     * @type {print_preview.PageNumberSet}
+     * Page ranges setting used used to generate the last preview.
+     * @type {!Array.<object.<{from: number, to: number}>>}
      * @private
      */
-    this.pageNumberSet_ = null;
+    this.pageRanges_ = null;
 
     /**
      * Margins type used to generate the last preview.
      * @type {!print_preview.ticket_items.MarginsType.Value}
      * @private
      */
     this.marginsType_ = print_preview.ticket_items.MarginsType.Value.DEFAULT;
 
     /**
      * Whether the document should have element CSS backgrounds printed.
@@ skipping 56 matching lines @@
         // Changes to these ticket items might not trigger a new preview, but
         // they still need to be recorded.
         this.marginsType_ = this.printTicketStore_.getMarginsType();
         return false;
       }
       this.isLandscapeEnabled_ = this.printTicketStore_.isLandscapeEnabled();
       this.isHeaderFooterEnabled_ =
           this.printTicketStore_.isHeaderFooterEnabled();
       this.isColorEnabled_ = this.printTicketStore_.isColorEnabled();
       this.isFitToPageEnabled_ = this.printTicketStore_.isFitToPageEnabled();
-      this.pageNumberSet_ = this.printTicketStore_.getPageNumberSet();
+      this.pageRanges_ = this.printTicketStore_.getPageRanges();
       this.marginsType_ = this.printTicketStore_.getMarginsType();
       this.isCssBackgroundEnabled_ =
           this.printTicketStore_.isCssBackgroundEnabled();
       this.isSelectionOnlyEnabled_ =
           this.printTicketStore_.isSelectionOnlyEnabled();
       this.selectedDestination_ = this.destinationStore_.selectedDestination;
 
       this.inFlightRequestId_++;
       this.nativeLayer_.startGetPreview(
           this.destinationStore_.selectedDestination,
@@ skipping 80 matching lines @@
      *     determine whether a new preview request should be issued.
      * @private
      */
     hasPreviewChanged_: function() {
       var ticketStore = this.printTicketStore_;
       return this.inFlightRequestId_ == -1 ||
           ticketStore.isLandscapeEnabled() != this.isLandscapeEnabled_ ||
           ticketStore.isHeaderFooterEnabled() != this.isHeaderFooterEnabled_ ||
           ticketStore.isColorEnabled() != this.isColorEnabled_ ||
           ticketStore.isFitToPageEnabled() != this.isFitToPageEnabled_ ||
-          !ticketStore.getPageNumberSet().equals(this.pageNumberSet_) ||
+          this.pageRanges_ == null ||
+          !areRangesEqual(ticketStore.getPageRanges(), this.pageRanges_) ||
           (ticketStore.getMarginsType() != this.marginsType_ &&
               ticketStore.getMarginsType() !=
                   print_preview.ticket_items.MarginsType.Value.CUSTOM) ||
           (ticketStore.getMarginsType() ==
               print_preview.ticket_items.MarginsType.Value.CUSTOM &&
               !ticketStore.getCustomMargins().equals(
                   ticketStore.getDocumentMargins())) ||
           (ticketStore.isCssBackgroundEnabled() !=
               this.isCssBackgroundEnabled_) ||
           (ticketStore.isSelectionOnlyEnabled() !=
@@ skipping 43 matching lines @@
      * Called when the document page count is received from the native layer.
      * Always occurs as a result of a preview request.
      * @param {cr.Event} event Contains the document's page count.
      * @private
      */
     onPageCountReady_: function(event) {
       if (this.inFlightRequestId_ != event.previewResponseId) {
         return; // Ignore old response.
       }
       this.printTicketStore_.updatePageCount(event.pageCount);
-      this.pageNumberSet_ = this.printTicketStore_.getPageNumberSet();
+      this.pageRanges_ = this.printTicketStore_.getPageRanges();
     },
 
     /**
      * Called when the print preview should be reloaded.
      * @param {cr.Event} event Contains the preview UID and request ID.
      * @private
      */
     onPreviewReload_: function(event) {
       if (this.inFlightRequestId_ != event.previewResponseId) {
         return; // Ignore old response.
@@ skipping 57 matching lines @@
       // current one.
       cr.dispatchSimpleEvent(this, PreviewGenerator.EventType.FAIL);
     }
   };
 
   // Export
   return {
     PreviewGenerator: PreviewGenerator
   };
 });