mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fix bug 125404 - hang on certain mathml pages. The table code relies on the display propertyto build its frames and things went out of sync when just using MathML tag names without the display associations in mathml.css. r=karnaze, sr=attinasi

This commit is contained in:
rbs%maths.uq.edu.au 2002-02-16 02:48:10 +00:00
Родитель 6dfab6a195
Коммит b5e8dbc2d6
2 изменённых файлов: 24 добавлений и 42 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

31
layout/base/nsCSSFrameConstructor.cpp
Просмотреть файл

@ -6503,6 +6503,10 @@ nsCSSFrameConstructor::ConstructMathMLFrame(nsIPresShell* aPresShell,
nsIStyleContext* aStyleContext,
nsFrameItems& aFrameItems)
{
// Make sure that we remain confined in the MathML world
if (aNameSpaceID != nsMathMLAtoms::nameSpaceID)
return NS_OK;
PRBool processChildren = PR_TRUE; // Whether we should process child content.
// MathML frames are inline frames.
// processChildren = PR_TRUE for inline frames.
@ -6515,10 +6519,6 @@ nsCSSFrameConstructor::ConstructMathMLFrame(nsIPresShell* aPresShell,
PRBool isReplaced = PR_FALSE;
PRBool ignoreInterTagWhitespace = PR_TRUE;
// Make sure that we remain confined in the MathML world
if (aNameSpaceID != nsMathMLAtoms::nameSpaceID)
return NS_OK;
NS_ASSERTION(aTag != nsnull, "null MathML tag");
if (aTag == nsnull)
return NS_OK;
@ -6583,7 +6583,8 @@ nsCSSFrameConstructor::ConstructMathMLFrame(nsIPresShell* aPresShell,
aTag == nsMathMLAtoms::mprescripts_ )
rv = NS_NewMathMLmrowFrame(aPresShell, &newFrame);
// CONSTRUCTION of MTABLE elements
else if (aTag == nsMathMLAtoms::mtable_) {
else if (aTag == nsMathMLAtoms::mtable_ &&
disp->mDisplay == NS_STYLE_DISPLAY_TABLE) {
// <mtable> is an inline-table -- but this isn't yet supported.
// What we do here is to wrap the table in an anonymous containing
// block so that it can mix better with other surrounding MathML markups
@ -6601,8 +6602,6 @@ nsCSSFrameConstructor::ConstructMathMLFrame(nsIPresShell* aPresShell,
getter_AddRefs(mrowContext));
InitAndRestoreFrame(aPresContext, aState, aContent, aParentFrame,
mrowContext, nsnull, newFrame);
// add it to the flow
aFrameItems.AddChild(newFrame);
// then, create a block frame that will wrap the table frame
nsIFrame* blockFrame;
@ -6615,8 +6614,6 @@ nsCSSFrameConstructor::ConstructMathMLFrame(nsIPresShell* aPresShell,
getter_AddRefs(blockContext));
InitAndRestoreFrame(aPresContext, aState, aContent, newFrame,
blockContext, nsnull, blockFrame);
// set the block frame as the initial child of the mrow frame
newFrame->SetInitialChildList(aPresContext, nsnull, blockFrame);
// then, create the table frame itself
nsCOMPtr<nsIStyleContext> tableContext;
@ -6636,18 +6633,12 @@ nsCSSFrameConstructor::ConstructMathMLFrame(nsIPresShell* aPresShell,
// set the outerTable as the initial child of the anonymous block
blockFrame->SetInitialChildList(aPresContext, nsnull, outerTable);
return rv;
}
else if (aTag == nsMathMLAtoms::mtd_) {
nsIFrame* innerCell;
PRBool pseudoParent;
nsMathMLmtableCreator mathTableCreator(aPresShell);
rv = ConstructTableCellFrame(aPresShell, aPresContext, aState, aContent,
aParentFrame, aStyleContext, mathTableCreator,
PR_FALSE, aFrameItems, newFrame, innerCell, pseudoParent);
if (!pseudoParent) {
// set the block frame as the initial child of the mrow frame
newFrame->SetInitialChildList(aPresContext, nsnull, blockFrame);
// add the new frame to the flow
aFrameItems.AddChild(newFrame);
}
return rv;
}
// End CONSTRUCTION of MTABLE elements

31
layout/html/style/src/nsCSSFrameConstructor.cpp
Просмотреть файл

@ -6503,6 +6503,10 @@ nsCSSFrameConstructor::ConstructMathMLFrame(nsIPresShell* aPresShell,
nsIStyleContext* aStyleContext,
nsFrameItems& aFrameItems)
{
// Make sure that we remain confined in the MathML world
if (aNameSpaceID != nsMathMLAtoms::nameSpaceID)
return NS_OK;
PRBool processChildren = PR_TRUE; // Whether we should process child content.
// MathML frames are inline frames.
// processChildren = PR_TRUE for inline frames.
@ -6515,10 +6519,6 @@ nsCSSFrameConstructor::ConstructMathMLFrame(nsIPresShell* aPresShell,
PRBool isReplaced = PR_FALSE;
PRBool ignoreInterTagWhitespace = PR_TRUE;
// Make sure that we remain confined in the MathML world
if (aNameSpaceID != nsMathMLAtoms::nameSpaceID)
return NS_OK;
NS_ASSERTION(aTag != nsnull, "null MathML tag");
if (aTag == nsnull)
return NS_OK;
@ -6583,7 +6583,8 @@ nsCSSFrameConstructor::ConstructMathMLFrame(nsIPresShell* aPresShell,
aTag == nsMathMLAtoms::mprescripts_ )
rv = NS_NewMathMLmrowFrame(aPresShell, &newFrame);
// CONSTRUCTION of MTABLE elements
else if (aTag == nsMathMLAtoms::mtable_) {
else if (aTag == nsMathMLAtoms::mtable_ &&
disp->mDisplay == NS_STYLE_DISPLAY_TABLE) {
// <mtable> is an inline-table -- but this isn't yet supported.
// What we do here is to wrap the table in an anonymous containing
// block so that it can mix better with other surrounding MathML markups
@ -6601,8 +6602,6 @@ nsCSSFrameConstructor::ConstructMathMLFrame(nsIPresShell* aPresShell,
getter_AddRefs(mrowContext));
InitAndRestoreFrame(aPresContext, aState, aContent, aParentFrame,
mrowContext, nsnull, newFrame);
// add it to the flow
aFrameItems.AddChild(newFrame);
// then, create a block frame that will wrap the table frame
nsIFrame* blockFrame;
@ -6615,8 +6614,6 @@ nsCSSFrameConstructor::ConstructMathMLFrame(nsIPresShell* aPresShell,
getter_AddRefs(blockContext));
InitAndRestoreFrame(aPresContext, aState, aContent, newFrame,
blockContext, nsnull, blockFrame);
// set the block frame as the initial child of the mrow frame
newFrame->SetInitialChildList(aPresContext, nsnull, blockFrame);
// then, create the table frame itself
nsCOMPtr<nsIStyleContext> tableContext;
@ -6636,18 +6633,12 @@ nsCSSFrameConstructor::ConstructMathMLFrame(nsIPresShell* aPresShell,
// set the outerTable as the initial child of the anonymous block
blockFrame->SetInitialChildList(aPresContext, nsnull, outerTable);
return rv;
}
else if (aTag == nsMathMLAtoms::mtd_) {
nsIFrame* innerCell;
PRBool pseudoParent;
nsMathMLmtableCreator mathTableCreator(aPresShell);
rv = ConstructTableCellFrame(aPresShell, aPresContext, aState, aContent,
aParentFrame, aStyleContext, mathTableCreator,
PR_FALSE, aFrameItems, newFrame, innerCell, pseudoParent);
if (!pseudoParent) {
// set the block frame as the initial child of the mrow frame
newFrame->SetInitialChildList(aPresContext, nsnull, blockFrame);
// add the new frame to the flow
aFrameItems.AddChild(newFrame);
}
return rv;
}
// End CONSTRUCTION of MTABLE elements