Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Prevent crash caused by trigger-happy deletion of frames during Bidi resolution. Bug 95228, r=lkemmel@il.ibm.com, sr=waterson

Browse Source
This commit is contained in:
smontagu%netscape.com 2002-04-22 22:55:19 +00:00
parent 81bdbc110c
commit a3b1208204
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
layout/base/nsBidiPresUtils.cpp
View File

@ -832,12 +832,19 @@ nsBidiPresUtils::RemoveBidiContinuation(nsIPresContext* aPresContext,
delete frame;
++aOffset;
}
else if (parent != nsnull) {
parent->RemoveFrame(aPresContext, *presShell, nsLayoutAtoms::nextBidi,
frame);
}
else {
frame->Destroy(aPresContext);
nsFrameState frameState;
frame->GetFrameState(&frameState);
if (frameState & NS_FRAME_IS_BIDI) {
// only delete Bidi frames
if (parent != nsnull) {
parent->RemoveFrame(aPresContext, *presShell,
nsLayoutAtoms::nextBidi, frame);
}
else {
frame->Destroy(aPresContext);
}
}
}
}
if (aNextFrame) {

17
layout/base/src/nsBidiPresUtils.cpp
View File

@ -832,12 +832,19 @@ nsBidiPresUtils::RemoveBidiContinuation(nsIPresContext* aPresContext,
delete frame;
++aOffset;
}
else if (parent != nsnull) {
parent->RemoveFrame(aPresContext, *presShell, nsLayoutAtoms::nextBidi,
frame);
}
else {
frame->Destroy(aPresContext);
nsFrameState frameState;
frame->GetFrameState(&frameState);
if (frameState & NS_FRAME_IS_BIDI) {
// only delete Bidi frames
if (parent != nsnull) {
parent->RemoveFrame(aPresContext, *presShell,
nsLayoutAtoms::nextBidi, frame);
}
else {
frame->Destroy(aPresContext);
}
}
}
}
if (aNextFrame) {