Bug 538082. These asserts are asserting things that happen to not always be true. r=dbaron

This commit is contained in:
Boris Zbarsky 2010-04-01 22:09:05 -04:00
parent fc92cdabc8
commit 7c4af56e3a
3 changed files with 43 additions and 8 deletions

View File

@ -0,0 +1,34 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:m="http://www.w3.org/1998/Math/MathML">
<script type="text/javascript">
<![CDATA[
function boom()
{
var e = document.getElementById("e");
var g = document.getElementById("maligngroup");
var M = "http://www.w3.org/1998/Math/MathML";
var a = document.createElementNS(M, "mfrac");
var b = document.createElementNS(M, "ms");
var c = document.createElementNS(M, "merror");
g.appendChild(c);
a.appendChild(b);
e.appendChild(a);
}
window.addEventListener("load", boom, false);
]]>
</script>
<m:math><box id="e"><m:mo><m:ms/><box style="display: inline;"><box><m:maligngroup id="maligngroup"/></box></box></m:mo></box></m:math>
</window>

View File

@ -280,5 +280,6 @@ load 536623-1.xhtml
load 537059-1.xhtml
load 537141-1.xhtml
load 537562-1.xhtml
load 538082-1.xul
load 541869-1.xhtml
load 541869-2.html

View File

@ -11141,6 +11141,10 @@ nsCSSFrameConstructor::ProcessPendingRestyleTable(
count = aRestyles.Count();
}
// Set mInStyleRefresh to false now, since the EndUpdate call might
// add more restyles.
mInStyleRefresh = PR_FALSE;
EndUpdate();
#ifdef DEBUG
@ -11163,8 +11167,9 @@ nsCSSFrameConstructor::ProcessPendingRestyles()
ProcessPendingRestyleTable(mPendingRestyles);
NS_POSTCONDITION(mPendingRestyles.Count() == 0,
"We should have processed mPendingRestyles to completion");
#ifdef DEBUG
PRUint32 oldPendingRestyleCount = mPendingRestyles.Count();
#endif
// ...and then process animation restyles. This needs to happen
// second because we need to start animations that resulted from the
@ -11179,12 +11184,7 @@ nsCSSFrameConstructor::ProcessPendingRestyles()
presContext->SetProcessingAnimationStyleChange(PR_FALSE);
presContext->SetProcessingRestyles(PR_FALSE);
mInStyleRefresh = PR_FALSE;
NS_POSTCONDITION(mPendingAnimationRestyles.Count() == 0,
"We should have processed mPendingAnimationRestyles to "
"completion");
NS_POSTCONDITION(mPendingRestyles.Count() == 0,
NS_POSTCONDITION(mPendingRestyles.Count() == oldPendingRestyleCount,
"We should not have posted new non-animation restyles while "
"processing animation restyles");