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

Bug 379418 - ""ASSERTION: internal error: '!aListName'" with MathML and Hebrew text" [p=mats.palmgren@bredband.net (Mats Palmgren) r=roc sr=bzbarsky a1.9=stuart]

This commit is contained in:
reed@reedloden.com 2007-11-09 00:19:45 -08:00
Родитель a8f734cc4f
Коммит 6943c6ae12
1 изменённых файлов: 34 добавлений и 20 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

26
layout/mathml/base/src/nsMathMLContainerFrame.h
Просмотреть файл

@ -333,6 +333,7 @@ public:
SetInitialChildList(nsIAtom* aListName,
nsIFrame* aChildList)
{
NS_ASSERTION(!aListName, "unexpected frame list");
nsresult rv = nsBlockFrame::SetInitialChildList(aListName, aChildList);
// re-resolve our subtree to set any mathml-expected data
nsMathMLContainerFrame::MapCommonAttributesIntoCSS(PresContext(), this);
@ -357,8 +358,10 @@ public:
AppendFrames(nsIAtom* aListName,
nsIFrame* aFrameList)
{
NS_ASSERTION(!aListName, "internal error");
NS_ASSERTION(!aListName || nsGkAtoms::nextBidi == aListName,
"unexpected frame list");
nsresult rv = nsBlockFrame::AppendFrames(aListName, aFrameList);
if (NS_LIKELY(!aListName))
nsMathMLContainerFrame::ReLayoutChildren(this,
NS_FRAME_HAS_DIRTY_CHILDREN);
return rv;
@ -369,8 +372,10 @@ public:
nsIFrame* aPrevFrame,
nsIFrame* aFrameList)
{
NS_ASSERTION(!aListName, "internal error");
NS_ASSERTION(!aListName || nsGkAtoms::nextBidi == aListName,
"unexpected frame list");
nsresult rv = nsBlockFrame::InsertFrames(aListName, aPrevFrame, aFrameList);
if (NS_LIKELY(!aListName))
nsMathMLContainerFrame::ReLayoutChildren(this,
NS_FRAME_HAS_DIRTY_CHILDREN);
return rv;
@ -380,8 +385,10 @@ public:
RemoveFrame(nsIAtom* aListName,
nsIFrame* aOldFrame)
{
NS_ASSERTION(!aListName, "internal error");
NS_ASSERTION(!aListName || nsGkAtoms::nextBidi == aListName,
"unexpected frame list");
nsresult rv = nsBlockFrame::RemoveFrame(aListName, aOldFrame);
if (NS_LIKELY(!aListName))
nsMathMLContainerFrame::ReLayoutChildren(this,
NS_FRAME_HAS_DIRTY_CHILDREN);
return rv;
@ -419,6 +426,7 @@ public:
SetInitialChildList(nsIAtom* aListName,
nsIFrame* aChildList)
{
NS_ASSERTION(!aListName, "unexpected frame list");
nsresult rv = nsInlineFrame::SetInitialChildList(aListName, aChildList);
// re-resolve our subtree to set any mathml-expected data
nsMathMLContainerFrame::MapCommonAttributesIntoCSS(PresContext(), this);
@ -443,8 +451,10 @@ public:
AppendFrames(nsIAtom* aListName,
nsIFrame* aFrameList)
{
NS_ASSERTION(!aListName, "internal error");
NS_ASSERTION(!aListName || nsGkAtoms::nextBidi == aListName,
"unexpected frame list");
nsresult rv = nsInlineFrame::AppendFrames(aListName, aFrameList);
if (NS_LIKELY(!aListName))
nsMathMLContainerFrame::ReLayoutChildren(this,
NS_FRAME_HAS_DIRTY_CHILDREN);
return rv;
@ -455,8 +465,10 @@ public:
nsIFrame* aPrevFrame,
nsIFrame* aFrameList)
{
NS_ASSERTION(!aListName, "internal error");
NS_ASSERTION(!aListName || nsGkAtoms::nextBidi == aListName,
"unexpected frame list");
nsresult rv = nsInlineFrame::InsertFrames(aListName, aPrevFrame, aFrameList);
if (NS_LIKELY(!aListName))
nsMathMLContainerFrame::ReLayoutChildren(this,
NS_FRAME_HAS_DIRTY_CHILDREN);
return rv;
@ -466,8 +478,10 @@ public:
RemoveFrame(nsIAtom* aListName,
nsIFrame* aOldFrame)
{
NS_ASSERTION(!aListName, "internal error");
NS_ASSERTION(!aListName || nsGkAtoms::nextBidi == aListName,
"unexpected frame list");
nsresult rv = nsInlineFrame::RemoveFrame(aListName, aOldFrame);
if (NS_LIKELY(!aListName))
nsMathMLContainerFrame::ReLayoutChildren(this,
NS_FRAME_HAS_DIRTY_CHILDREN);
return rv;