mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-01 17:23:59 +00:00
Don't propagate the FRAMES_ARE_EMPTY flag when continuations cross block frame boundaries. Bug 495875, r+sr=roc
This commit is contained in:
parent
7a531f32da
commit
3ee173e3c1
7
layout/generic/crashtests/495875-1.html
Normal file
7
layout/generic/crashtests/495875-1.html
Normal file
@ -0,0 +1,7 @@
|
||||
<html>
|
||||
<head></head>
|
||||
<body style="-moz-column-count: 2; white-space: pre-wrap; font-size-adjust: 4294967297; text-transform: uppercase;"
|
||||
onload="document.body.style.fontSizeAdjust = '';"
|
||||
>하A B Cك喙D
|
||||
|
||||
</body></html>
|
7
layout/generic/crashtests/495875-2.html
Normal file
7
layout/generic/crashtests/495875-2.html
Normal file
@ -0,0 +1,7 @@
|
||||
<html>
|
||||
<head></head>
|
||||
<body style="-moz-column-count: 2; white-space: pre-wrap; font-size-adjust: 4294967297; text-transform: uppercase;"
|
||||
onload="document.body.style.fontSizeAdjust = '';"
|
||||
>하A B C<b>у</b>喙D
|
||||
|
||||
</body></html>
|
@ -264,6 +264,8 @@ load 493111-1.html
|
||||
load 493118-1.html
|
||||
load 494300-1.xul
|
||||
load 494332-1.html
|
||||
load 495875-1.html
|
||||
load 495875-2.html
|
||||
load 501535-1.html
|
||||
load 503961-1.xhtml
|
||||
load 503961-2.html
|
||||
|
@ -5359,6 +5359,11 @@ nsBlockFrame::DoRemoveFrame(nsIFrame* aDeletedFrame, PRUint32 aFlags)
|
||||
// The deceased frames continuation is not a child of the
|
||||
// current block. So break out of the loop so that we advance
|
||||
// to the next parent.
|
||||
//
|
||||
// If we have a continuation in a different block then all bets are
|
||||
// off regarding whether we are deleting frames without actual content,
|
||||
// so don't propagate FRAMES_ARE_EMPTY any further.
|
||||
aFlags &= ~FRAMES_ARE_EMPTY;
|
||||
break;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user