b=75893. r=mcclusk sr=attinasi a=chofmann

gfx/src/mac/nsDeviceContextMac.cpp

@@ -159,8 +159,14 @@ NS_IMETHODIMP nsDeviceContextMac :: SupportsNativeWidgets(PRBool &aSupportsWidge
   // Raptor currently doesn't work this way and needs to be fixed.
   // (please remove this comment when this situation is rectified)
   
+  if( nsnull != mSpec){
+  	aSupportsWidgets = PR_FALSE;
+  } else {
+  	aSupportsWidgets = PR_TRUE;
+  }
+  
   //if (nsnull == mSurface)
-    aSupportsWidgets = PR_TRUE;
+    
   //else
    //aSupportsWidgets = PR_FALSE;
 

gfx/src/nsPrintOptionsImpl.cpp

@@ -103,7 +103,7 @@ nsPrintOptions::nsPrintOptions() :
   mPrintInColor(PR_TRUE),
   mPaperSize(kLetterPaperSize),
   mPrintToFile(PR_FALSE),
-  mPrintFrameType(kSelectedFrame),
+  mPrintFrameType(kFramesAsIs),
   mHowToEnableFrameUI(kFrameEnableNone),
   mPageNumJust(kJustLeft),
   mIsCancelled(PR_FALSE),

layout/generic/nsSimplePageSequence.cpp

@@ -773,15 +773,19 @@ nsSimplePageSequenceFrame::PrintNextPage(nsIPresContext*  aPresContext,
 NS_IMETHODIMP
 nsSimplePageSequenceFrame::DoPageEnd(nsIPresContext*  aPresContext)
 {
+	nsresult rv = NS_OK;
+	
   if (mPrintThisPage) {
     nsCOMPtr<nsIDeviceContext> dc;
     aPresContext->GetDeviceContext(getter_AddRefs(dc));
     NS_ASSERTION(dc, "nsIDeviceContext can't be NULL!");
 
-    PRINT_DEBUG_MSG1("***************** End Page (DoPageEnd) *****************\n");
-    nsresult rv = dc->EndPage();
-    if (NS_FAILED(rv)) {
-      return rv;
+    if(mSkipPageEnd){
+	    PRINT_DEBUG_MSG1("***************** End Page (DoPageEnd) *****************\n");
+      nsresult rv = dc->EndPage();
+	    if (NS_FAILED(rv)) {
+	      return rv;
+      }
     }
   }
 
@@ -791,7 +795,12 @@ nsSimplePageSequenceFrame::DoPageEnd(nsIPresContext*  aPresContext)
   }
 
   mPageNum++;
-  return mCurrentPageFrame->GetNextSibling(&mCurrentPageFrame);
+  
+  if( nsnull != mCurrentPageFrame){
+    rv = mCurrentPageFrame->GetNextSibling(&mCurrentPageFrame);
+  }
+  
+  return rv;
 }
 
 NS_IMETHODIMP

layout/html/base/src/nsSimplePageSequence.cpp

@@ -773,15 +773,19 @@ nsSimplePageSequenceFrame::PrintNextPage(nsIPresContext*  aPresContext,
 NS_IMETHODIMP
 nsSimplePageSequenceFrame::DoPageEnd(nsIPresContext*  aPresContext)
 {
+	nsresult rv = NS_OK;
+	
   if (mPrintThisPage) {
     nsCOMPtr<nsIDeviceContext> dc;
     aPresContext->GetDeviceContext(getter_AddRefs(dc));
     NS_ASSERTION(dc, "nsIDeviceContext can't be NULL!");
 
-    PRINT_DEBUG_MSG1("***************** End Page (DoPageEnd) *****************\n");
-    nsresult rv = dc->EndPage();
-    if (NS_FAILED(rv)) {
-      return rv;
+    if(mSkipPageEnd){
+	    PRINT_DEBUG_MSG1("***************** End Page (DoPageEnd) *****************\n");
+      nsresult rv = dc->EndPage();
+	    if (NS_FAILED(rv)) {
+	      return rv;
+      }
     }
   }
 
@@ -791,7 +795,12 @@ nsSimplePageSequenceFrame::DoPageEnd(nsIPresContext*  aPresContext)
   }
 
   mPageNum++;
-  return mCurrentPageFrame->GetNextSibling(&mCurrentPageFrame);
+  
+  if( nsnull != mCurrentPageFrame){
+    rv = mCurrentPageFrame->GetNextSibling(&mCurrentPageFrame);
+  }
+  
+  return rv;
 }
 
 NS_IMETHODIMP