Backed out changeset cb6bcb4d91d4 (bug 1768741) for causing build bustages on nsPrintJob.cpp. CLOSED TREE

layout/printing/nsPrintData.cpp

@@ -26,6 +26,7 @@ extern mozilla::LazyLogModule gPrintingLog;
 nsPrintData::nsPrintData(ePrintDataType aType)
     : mType(aType),
       mPrintDocList(0),
+      mIsParentAFrameSet(false),
       mOnStartSent(false),
       mIsAborted(false),
       mPreparingForPrint(false),

layout/printing/nsPrintData.h

@@ -60,6 +60,7 @@ class nsPrintData {
   // mKids (and their mKids, etc.)
   nsTArray<nsPrintObject*> mPrintDocList;
 
+  bool mIsParentAFrameSet;
   bool mOnStartSent;
   bool mIsAborted;          // tells us the document is being aborted
   bool mPreparingForPrint;  // see comments above

layout/printing/nsPrintJob.cpp

@@ -2060,6 +2060,9 @@ void nsPrintJob::PageDone(nsresult aResult) {
 //---------------------------------------------------------------------
 void nsPrintJob::SetIsPrinting(bool aIsPrinting) {
   mIsDoingPrinting = aIsPrinting;
+  if (aIsPrinting) {
+    mHasEverPrinted = true;
+  }
   if (mPrt && aIsPrinting) {
     mPrt->mPreparingForPrint = true;
   }

layout/printing/nsPrintJob.h

@@ -116,6 +116,7 @@ class nsPrintJob final : public nsIWebProgressListener,
 
   bool IsDoingPrint() const { return mIsDoingPrinting; }
   bool CreatedForPrintPreview() const { return mCreatedForPrintPreview; }
+  bool HasEverPrinted() const { return mHasEverPrinted; }
   /// If the returned value is not greater than zero, an error occurred.
   int32_t GetRawNumPages() const;
   // Returns whether the preview is empty due to page range exclusion.
@@ -282,6 +283,7 @@ class nsPrintJob final : public nsIWebProgressListener,
   bool mCreatedForPrintPreview = false;
   bool mIsCreatingPrintPreview = false;
   bool mIsDoingPrinting = false;
+  bool mHasEverPrinted = false;
   bool mDidLoadDataForPrinting = false;
   bool mDoingInitialReflow = false;
   bool mIsDestroying = false;