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

Backing out 253888 again due to Tp regression plus another problem I noticed (frame properties not getting destroyed on frame destruction)

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@161116 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bryner%brianryner.com
2004-08-22 07:10:50 +00:00
parent 0501b2872a
commit 2ac3245dec
50 changed files with 943 additions and 1233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/layout/html/base/src/nsPresShell.cpp
View File

@@ -6808,12 +6808,20 @@ CompareTrees(nsPresContext* aFirstPresContext, nsIFrame* aFirstFrame,
// verify that neither frame has a space manager,
// or they both do and the space managers are equivalent
nsSpaceManager *sm1 = NS_STATIC_CAST(nsSpaceManager*,
k1->GetProperty(nsLayoutAtoms::spaceManagerProperty));
nsFrameManager *fm1 = aFirstPresContext->FrameManager();
NS_ASSERTION(fm1, "no frame manager for primary tree!");
nsSpaceManager *sm1 =
NS_STATIC_CAST(nsSpaceManager*, fm1->GetFrameProperty(k1,
nsLayoutAtoms::spaceManagerProperty, 0));
// look at the test frame
nsSpaceManager *sm2 = NS_STATIC_CAST(nsSpaceManager*,
k2->GetProperty(nsLayoutAtoms::spaceManagerProperty));
nsFrameManager *fm2 = aSecondPresContext->FrameManager();
NS_ASSERTION(fm2, "no frame manager for test tree!");
nsSpaceManager *sm2 =
NS_STATIC_CAST(nsSpaceManager*, fm2->GetFrameProperty(k2,
nsLayoutAtoms::spaceManagerProperty, 0));
// now compare the space managers
if (((nsnull == sm1) && (nsnull != sm2)) ||