Commit 47516e9e authored by Jonathan Watt's avatar Jonathan Watt
Browse files

Bug 1770539 p4 - Move nsPrintData::mNumPrintablePages to nsPrintJob. r=emilio 

Depends on D146975

Differential Revision: https://phabricator.services.mozilla.com/D146976
parent db898579

layout/printing/nsPrintData.cpp

+1 −2
Original line number Diff line number Diff line
@@ -28,8 +28,7 @@ nsPrintData::nsPrintData(ePrintDataType aType) 
      mPrintDocList(0),

      mOnStartSent(false),

      mIsAborted(false),

      mPreparingForPrint(false),

      mNumPrintablePages(0) {}

      mPreparingForPrint(false) {}



nsPrintData::~nsPrintData() {

  // Only Send an OnEndPrinting if we have started printing

layout/printing/nsPrintData.h

+0 −1
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ class nsPrintData { 
  bool mOnStartSent;

  bool mIsAborted;          // tells us the document is being aborted

  bool mPreparingForPrint;  // see comments above

  int32_t mNumPrintablePages;



 private:

  nsPrintData() = delete;

layout/printing/nsPrintJob.cpp

+4 −5
Original line number Diff line number Diff line
@@ -876,9 +876,9 @@ nsresult nsPrintJob::SetupToPrintContent() { 
  PR_PL(("-------------------------------------------------------\n"));

  PR_PL(("\n"));



  CalcNumPrintablePages(printData->mNumPrintablePages);

  CalcNumPrintablePages(mNumPrintablePages);



  PR_PL(("--- Printing %d pages\n", printData->mNumPrintablePages));

  PR_PL(("--- Printing %d pages\n", mNumPrintablePages));

  DUMP_DOC_TREELAYOUT;



  // Print listener setup...
@@ -905,14 +905,13 @@ nsresult nsPrintJob::SetupToPrintContent() { 
                        docURLStr);



  int32_t startPage = 1;

  int32_t endPage = printData->mNumPrintablePages;

  int32_t endPage = mNumPrintablePages;



  nsTArray<int32_t> ranges;

  mPrintSettings->GetPageRanges(ranges);

  for (size_t i = 0; i < ranges.Length(); i += 2) {

    startPage = std::max(1, std::min(startPage, ranges[i]));

    endPage = std::min(printData->mNumPrintablePages,

                       std::max(endPage, ranges[i + 1]));

    endPage = std::min(mNumPrintablePages, std::max(endPage, ranges[i + 1]));

  }



  nsresult rv = NS_OK;

layout/printing/nsPrintJob.h

+2 −0
Original line number Diff line number Diff line
@@ -266,6 +266,8 @@ class nsPrintJob final : public nsIWebProgressListener, 


  float mScreenDPI = 115.0f;



  int32_t mNumPrintablePages = 0;



  bool mCreatedForPrintPreview = false;

  bool mIsCreatingPrintPreview = false;

  bool mIsDoingPrinting = false;