Bug 254331: Cannot print in black & white again, only color. r=bzbarsky, sr=roc

gfx/src/gtk/nsDeviceContextSpecG.cpp

@@ -432,6 +432,7 @@ NS_IMETHODIMP nsDeviceContextSpecGTK::Init(nsIPrintSettings *aPS,
     mToPrinter   = !tofile;
     mCopies      = copies;
     mIsPPreview  = aIsPrintPreview;
+    mCancel      = PR_FALSE;
   }
 
   return rv;

gfx/src/gtk/nsDeviceContextSpecG.h

@@ -101,11 +101,11 @@ public:
   
 protected:
   nsCOMPtr<nsIPrintSettings> mPrintSettings;
-  PRBool mToPrinter : 1;      /* If PR_TRUE, print to printer */
-  PRBool mIsPPreview : 1;     /* If PR_TRUE, is print preview */
-  PRBool mFpf : 1;            /* If PR_TRUE, first page first */
-  PRBool mGrayscale : 1;      /* If PR_TRUE, print grayscale */
-  PRBool mCancel : 1;         /* If PR_TRUE, user cancelled */
+  PRPackedBool mToPrinter : 1;      /* If PR_TRUE, print to printer */
+  PRPackedBool mIsPPreview : 1;     /* If PR_TRUE, is print preview */
+  PRPackedBool mFpf : 1;            /* If PR_TRUE, first page first */
+  PRPackedBool mGrayscale : 1;      /* If PR_TRUE, print grayscale */
+  PRPackedBool mCancel : 1;         /* If PR_TRUE, user cancelled */
   int    mOrientation;        /* Orientation e.g. Portrait */
   char   mCommand[PATH_MAX];  /* Print command e.g., lpr */
   char   mPath[PATH_MAX];     /* If toPrinter = PR_FALSE, dest file */

gfx/src/xlib/nsDeviceContextSpecXlib.cpp

@@ -407,6 +407,7 @@ NS_IMETHODIMP nsDeviceContextSpecXlib::Init(nsIPrintSettings *aPS,
     mToPrinter   = !tofile;
     mCopies      = copies;
     mIsPPreview  = aIsPrintPreview;
+    mCancel      = PR_FALSE;
   }
 
   return rv;

gfx/src/xlib/nsDeviceContextSpecXlib.h

@@ -101,11 +101,11 @@ public:
   
 protected:
   nsCOMPtr<nsIPrintSettings> mPrintSettings;
-  PRBool mToPrinter : 1;      /* If PR_TRUE, print to printer */
-  PRBool mIsPPreview : 1;     /* If PR_TRUE, is print preview */
-  PRBool mFpf : 1;            /* If PR_TRUE, first page first */
-  PRBool mGrayscale : 1;      /* If PR_TRUE, print grayscale */
-  PRBool mCancel : 1;         /* If PR_TRUE, user cancelled */
+  PRPackedBool mToPrinter : 1;      /* If PR_TRUE, print to printer */
+  PRPackedBool mIsPPreview : 1;     /* If PR_TRUE, is print preview */
+  PRPackedBool mFpf : 1;            /* If PR_TRUE, first page first */
+  PRPackedBool mGrayscale : 1;      /* If PR_TRUE, print grayscale */
+  PRPackedBool mCancel : 1;         /* If PR_TRUE, user cancelled */
   int    mOrientation;        /* Orientation e.g. Portrait */
   char   mCommand[PATH_MAX];  /* Print command e.g., lpr */
   char   mPath[PATH_MAX];     /* If toPrinter = PR_FALSE, dest file */