Bug 535794 - Shorter printPageDelay, r=roc

layout/printing/nsPagePrintTimer.cpp

@@ -45,6 +45,7 @@ NS_IMPL_ISUPPORTS1(nsPagePrintTimer, nsITimerCallback)
 nsPagePrintTimer::nsPagePrintTimer() :
   mPrintEngine(nsnull),
   mDelay(0),
+  mFiringCount(0),
   mPrintObj(nsnull)
 {
 }
@@ -69,7 +70,16 @@ nsPagePrintTimer::StartTimer(PRBool aUseDelay)
   if (NS_FAILED(result)) {
     NS_WARNING("unable to start the timer");
   } else {
-    mTimer->InitWithCallback(this, aUseDelay?mDelay:0, nsITimer::TYPE_ONE_SHOT);
+    PRUint32 delay = 0;
+    if (aUseDelay) {
+      if (mFiringCount < 10) {
+        // Longer delay for the few first pages.
+        delay = mDelay + ((10 - mFiringCount) * 100);
+      } else {
+        delay = mDelay;
+      }
+    }
+    mTimer->InitWithCallback(this, delay, nsITimer::TYPE_ONE_SHOT);
   }
   return result;
 }
@@ -100,6 +110,7 @@ nsPagePrintTimer::Notify(nsITimer *timer)
     // returns true.)
     Stop(); 
     if (initNewTimer) {
+      ++mFiringCount;
       nsresult result = StartTimer(inRange);
       if (NS_FAILED(result)) {
         donePrinting = PR_TRUE;     // had a failure.. we are finished..

layout/printing/nsPagePrintTimer.h

@@ -75,6 +75,7 @@ private:
   nsCOMPtr<nsIDocumentViewerPrint> mDocViewerPrint;
   nsCOMPtr<nsITimer>         mTimer;
   PRUint32                   mDelay;
+  PRUint32                   mFiringCount;
   nsPrintObject *            mPrintObj;
 };
 

layout/printing/nsPrintEngine.cpp

@@ -3313,7 +3313,7 @@ nsPrintEngine::StartPagePrintTimer(nsPrintObject* aPO)
 
     // Get the delay time in between the printing of each page
     // this gives the user more time to press cancel
-    PRInt32 printPageDelay = 500;
+    PRInt32 printPageDelay = 50;
     mPrt->mPrintSettings->GetPrintPageDelay(&printPageDelay);
 
     mPagePrintTimer->Init(this, mDocViewerPrint, printPageDelay);

widget/src/xpwidgets/nsPrintOptionsImpl.cpp

@@ -105,7 +105,7 @@ static const char kPrintCommand[]       = "print_command";
 static const char kPrinterName[]        = "print_printer";
 static const char kPrintToFile[]        = "print_to_file";
 static const char kPrintToFileName[]    = "print_to_filename";
-static const char kPrintPageDelay[]     = "print_pagedelay";
+static const char kPrintPageDelay[]     = "print_page_delay";
 static const char kPrintBGColors[]      = "print_bgcolor";
 static const char kPrintBGImages[]      = "print_bgimages";
 static const char kPrintShrinkToFit[]   = "print_shrink_to_fit";

widget/src/xpwidgets/nsPrintSettingsImpl.cpp

@@ -63,7 +63,7 @@ nsPrintSettings::nsPrintSettings() :
   mPrintPreview(PR_FALSE),
   mShrinkToFit(PR_TRUE),
   mShowPrintProgress(PR_TRUE),
-  mPrintPageDelay(500),
+  mPrintPageDelay(50),
   mPaperData(0),
   mPaperSizeType(kPaperSizeDefined),
   mPaperWidth(8.5),