wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

DEBUG: Use a flag to track when we are inside RemoveFrame() and assert it's false in GetPrimaryFrameFor(). b=458636 r+sr=roc

Browse Source
This commit is contained in:
Mats Palmgren 2008-10-13 00:05:04 +02:00
parent 8c39edefbd
commit ee40d22b13
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
layout/base/nsFrameManager.cpp
View File

@ -275,7 +275,7 @@ nsFrameManager::Destroy()
// Destroy the frame hierarchy.
mPresShell->SetIgnoreFrameDestruction(PR_TRUE);
mIsDestroyingFrames = PR_TRUE; // This flag prevents GetPrimaryFrameFor from returning pointers to destroyed frames
mIsDestroying = PR_TRUE; // This flag prevents GetPrimaryFrameFor from returning pointers to destroyed frames
// Unregister all placeholders before tearing down the frame tree
nsFrameManager::ClearPlaceholderFrameMap();
@ -324,12 +324,12 @@ nsIFrame*
nsFrameManager::GetPrimaryFrameFor(nsIContent* aContent,
PRInt32 aIndexHint)
{
NS_ASSERTION(!mIsDestroyingFrames,
"GetPrimaryFrameFor() called while frames are being destroyed!");
NS_ENSURE_TRUE(aContent, nsnull);
if (mIsDestroyingFrames) {
#ifdef DEBUG
printf("GetPrimaryFrameFor() called while nsFrameManager is being destroyed!\n");
#endif
if (mIsDestroying) {
NS_ERROR("GetPrimaryFrameFor() called while nsFrameManager is being destroyed!");
return nsnull;
}
@ -684,6 +684,10 @@ nsFrameManager::RemoveFrame(nsIFrame* aParentFrame,
nsIAtom* aListName,
nsIFrame* aOldFrame)
{
#ifdef DEBUG
PRBool wasDestroyingFrames = mIsDestroyingFrames;
mIsDestroyingFrames = PR_TRUE;
#endif
// In case the reflow doesn't invalidate anything since it just leaves
// a gap where the old frame was, we invalidate it here. (This is
// reasonably likely to happen when removing a last child in a way
@ -692,7 +696,11 @@ nsFrameManager::RemoveFrame(nsIFrame* aParentFrame,
// is important in the presence of absolute positioning
aOldFrame->Invalidate(aOldFrame->GetOverflowRect());
return aParentFrame->RemoveFrame(aListName, aOldFrame);
nsresult rv = aParentFrame->RemoveFrame(aListName, aOldFrame);
#ifdef DEBUG
mIsDestroyingFrames = wasDestroyingFrames;
#endif
return rv;
}
//----------------------------------------------------------------------

5
layout/base/nsFrameManagerBase.h
View File

@ -78,7 +78,10 @@ protected:
PLDHashTable mPrimaryFrameMap;
PLDHashTable mPlaceholderMap;
UndisplayedMap* mUndisplayedMap;
PRBool mIsDestroyingFrames;
PRPackedBool mIsDestroying; // The frame manager is being destroyed.
#ifdef DEBUG
PRPackedBool mIsDestroyingFrames; // The frame manager is destroying some frame(s).
#endif
};
#endif