Bug 722117 - "ASSERTION: CalcDifference() returned bigger hint than MaxDifference()" with blink. r=roc

This commit is contained in:
Mats Palmgren 2012-01-29 09:48:20 +01:00
parent b5116372c8
commit 4900479470
4 changed files with 11 additions and 2 deletions

View File

@ -0,0 +1,8 @@
<!DOCTYPE html><html><body>
<script>
function doTest() {
document.body.style.MozTextBlink = 'blink';
}
document.addEventListener("MozReftestInvalidate", doTest, false);
</script>
</body></html>

View File

@ -75,3 +75,4 @@ asserts(2) load 671799-2.html
load 690990-1.html
load 696188-1.html
load 700116.html
load 722117.html

View File

@ -467,6 +467,7 @@ nsStyleContext::CalcStyleDifference(nsStyleContext* aOther)
maxHint = nsChangeHint(NS_STYLE_HINT_REFLOW | NS_STYLE_HINT_UPDATE_OVERFLOW);
DO_STRUCT_DIFFERENCE(Border);
DO_STRUCT_DIFFERENCE(TextReset);
// Changes to 'z-index' cause SyncFrameView.
maxHint = nsChangeHint(NS_STYLE_HINT_REFLOW | nsChangeHint_SyncFrameView);
@ -482,7 +483,6 @@ nsStyleContext::CalcStyleDifference(nsStyleContext* aOther)
DO_STRUCT_DIFFERENCE(Font);
DO_STRUCT_DIFFERENCE(Margin);
DO_STRUCT_DIFFERENCE(Padding);
DO_STRUCT_DIFFERENCE(TextReset);
// Outline needs to update the overflow and repaint.
maxHint = NS_STYLE_HINT_UPDATE_OVERFLOW;

View File

@ -2786,7 +2786,7 @@ nsChangeHint nsStyleTextReset::CalcDifference(const nsStyleTextReset& aOther) co
/* static */
nsChangeHint nsStyleTextReset::MaxDifference()
{
return NS_STYLE_HINT_REFLOW;
return nsChangeHint(NS_STYLE_HINT_REFLOW | NS_STYLE_HINT_UPDATE_OVERFLOW);
}
#endif