From 96700ff7a9f4d7bac4adf128a1a4a34f76efc4cd Mon Sep 17 00:00:00 2001 From: "rbs%maths.uq.edu.au" Date: Tue, 9 Jul 2002 01:34:12 +0000 Subject: [PATCH] crash if position: absolute applied to , b=151054, r=roc+moz, sr=waterson git-svn-id: svn://10.0.0.236/trunk@124799 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/base/nsCSSFrameConstructor.cpp | 7 ++++--- mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/mozilla/layout/base/nsCSSFrameConstructor.cpp b/mozilla/layout/base/nsCSSFrameConstructor.cpp index f9d74e25b79..74d33afc082 100644 --- a/mozilla/layout/base/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/base/nsCSSFrameConstructor.cpp @@ -6982,9 +6982,6 @@ nsCSSFrameConstructor::ConstructMathMLFrame(nsIPresShell* aPresShell, nsHTMLContainerFrame::CreateViewForFrame(aPresContext, newFrame, aStyleContext, aParentFrame, PR_FALSE); - // Add the new frame to our list of frame items. - aFrameItems.AddChild(newFrame); - // Process the child content if requested nsFrameItems childItems; if (processChildren) { @@ -7015,6 +7012,10 @@ nsCSSFrameConstructor::ConstructMathMLFrame(nsIPresShell* aPresShell, // Add the placeholder frame to the flow aFrameItems.AddChild(placeholderFrame); } + else { + // Add the new frame to our list of frame items. + aFrameItems.AddChild(newFrame); + } } return rv; } diff --git a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp index f9d74e25b79..74d33afc082 100644 --- a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp @@ -6982,9 +6982,6 @@ nsCSSFrameConstructor::ConstructMathMLFrame(nsIPresShell* aPresShell, nsHTMLContainerFrame::CreateViewForFrame(aPresContext, newFrame, aStyleContext, aParentFrame, PR_FALSE); - // Add the new frame to our list of frame items. - aFrameItems.AddChild(newFrame); - // Process the child content if requested nsFrameItems childItems; if (processChildren) { @@ -7015,6 +7012,10 @@ nsCSSFrameConstructor::ConstructMathMLFrame(nsIPresShell* aPresShell, // Add the placeholder frame to the flow aFrameItems.AddChild(placeholderFrame); } + else { + // Add the new frame to our list of frame items. + aFrameItems.AddChild(newFrame); + } } return rv; }