From 9a0e324461538604f98e4f0ba2e859641e80b77d Mon Sep 17 00:00:00 2001
From: "masayuki%d-toybox.com" <masayuki%d-toybox.com>
Date: Tue, 29 Nov 2005 05:40:36 +0000
Subject: [PATCH] Bug 317289 hang (never finish/freeze) printing selection in
 iframe r+sr=roc

---
 layout/printing/nsPrintEngine.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/layout/printing/nsPrintEngine.cpp b/layout/printing/nsPrintEngine.cpp
index dd1c3c0b90db..a590f461edf2 100644
--- a/layout/printing/nsPrintEngine.cpp
+++ b/layout/printing/nsPrintEngine.cpp
@@ -3006,9 +3006,9 @@ nsPrintEngine::PrintDocContent(nsPrintObject* aPO, nsresult& aStatus)
     }
   }
 
-  // If |aPO->mPrintAsIs| is true, the kids are processed in |PrintPage|
-  // instead of here.
-  if (!aPO->mInvisible && !aPO->mPrintAsIs) {
+  // If |aPO->mPrintAsIs| and |aPO->mHasBeenPrinted| are true,
+  // the kids frames are already processed in |PrintPage|.
+  if (!aPO->mInvisible && !(aPO->mPrintAsIs && aPO->mHasBeenPrinted)) {
     for (PRInt32 i=0;i<aPO->mKids.Count();i++) {
       nsPrintObject* po = (nsPrintObject*)aPO->mKids[i];
       PRBool printed = PrintDocContent(po, aStatus);