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

Fix for 36084, r=alecf,a=alecf. Put guard code around code that dereferences a context,

Browse Source 
it was null, causing asserts, and eventually, a crash. Bug was a smoketest blocker.
This commit is contained in:
syd%netscape.com 2000-04-18 05:38:05 +00:00
parent fb1a037854
commit 76a839c993
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
layout/base/nsCSSFrameConstructor.cpp
View File

@ -8369,8 +8369,10 @@ DoDeletingFrameSubtree(nsIPresContext* aPresContext,
// Remove the mapping from the content object to its frame
nsCOMPtr<nsIContent> content;
aFrame->GetContent(getter_AddRefs(content));
aFrameManager->SetPrimaryFrameFor(content, nsnull);
aFrameManager->ClearAllUndisplayedContentIn(content);
if ( content ) {
aFrameManager->SetPrimaryFrameFor(content, nsnull);
aFrameManager->ClearAllUndisplayedContentIn(content);
}
// Walk aFrame's child frames
nsIAtom* childListName = nsnull;

6
layout/html/style/src/nsCSSFrameConstructor.cpp
View File

@ -8369,8 +8369,10 @@ DoDeletingFrameSubtree(nsIPresContext* aPresContext,
// Remove the mapping from the content object to its frame
nsCOMPtr<nsIContent> content;
aFrame->GetContent(getter_AddRefs(content));
aFrameManager->SetPrimaryFrameFor(content, nsnull);
aFrameManager->ClearAllUndisplayedContentIn(content);
if ( content ) {
aFrameManager->SetPrimaryFrameFor(content, nsnull);
aFrameManager->ClearAllUndisplayedContentIn(content);
}
// Walk aFrame's child frames
nsIAtom* childListName = nsnull;