Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Elimninate the last known source of bogus "wrong parent style context"

Browse Source 
warnings, and make these warnings into assertions.  Bug 374297, r+sr+a=dbaron


git-svn-id: svn://10.0.0.236/trunk@237443 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu
2007-10-09 02:45:10 +00:00
parent 313dd1a271
commit 8ab45f98a8
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
mozilla/layout/base/nsCSSFrameConstructor.cpp
View File

@@ -9923,23 +9923,13 @@ nsCSSFrameConstructor::ProcessRestyledFrames(nsStyleChangeList& aChangeList)
viewMgr->SynthesizeMouseMove(PR_FALSE);
}
}
#ifdef DEBUG
// reget from content since it may have been regenerated...
if (content) {
nsIFrame* frame = mPresShell->GetPrimaryFrameFor(content);
if (frame) {
mPresShell->FrameManager()->DebugVerifyStyleTree(frame);
}
} else {
NS_WARNING("Unable to test style tree integrity -- no content node");
}
#endif
}
EndUpdate();
// cleanup references
// cleanup references and verify the style tree. Note that the latter needs
// to happen once we've processed the whole list, since until then the tree
// is not in fact in a consistent state.
index = count;
while (0 <= --index) {
const nsStyleChangeData* changeData;
@@ -9948,6 +9938,18 @@ nsCSSFrameConstructor::ProcessRestyledFrames(nsStyleChangeList& aChangeList)
propTable->DeleteProperty(changeData->mFrame,
nsGkAtoms::changeListProperty);
}
#ifdef DEBUG
// reget frame from content since it may have been regenerated...
if (changeData->mContent) {
nsIFrame* frame = mPresShell->GetPrimaryFrameFor(changeData->mContent);
if (frame) {
mPresShell->FrameManager()->DebugVerifyStyleTree(frame);
}
} else {
NS_WARNING("Unable to test style tree integrity -- no content node");
}
#endif
}
aChangeList.Clear();