Bug 73547: Don't create child frames for an nsHTMLFrameOuterFrame, even via document.write. r=pavlov@netscape.com, sr=jst@netscape.com

layout/base/nsCSSFrameConstructor.cpp

@@ -8080,7 +8080,9 @@ nsCSSFrameConstructor::ContentAppended(nsIPresContext* aPresContext,
           }
         }
       }
-      else {
+      // Don't create child frames for iframes/frames, they should not
+      // display any content that they contain.
+      else if (nsLayoutAtoms::htmlFrameOuterFrame != frameType.get()) {
         // Construct a child frame (that does not have a table as parent)
         ConstructFrame(shell, aPresContext, state, childContent, parentFrame, frameItems);
       }

layout/html/style/src/nsCSSFrameConstructor.cpp

@@ -8080,7 +8080,9 @@ nsCSSFrameConstructor::ContentAppended(nsIPresContext* aPresContext,
           }
         }
       }
-      else {
+      // Don't create child frames for iframes/frames, they should not
+      // display any content that they contain.
+      else if (nsLayoutAtoms::htmlFrameOuterFrame != frameType.get()) {
         // Construct a child frame (that does not have a table as parent)
         ConstructFrame(shell, aPresContext, state, childContent, parentFrame, frameItems);
       }