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

Bug 334829: FindFrameWithContent() can't find certain frames

Browse Source 
If the hint frame's location in the frame tree doesn't match its element's location in the content tree, the hint is useless, and we don't correctly reboot the search without the hint. Add a flag to make the reboot work.
Patch courtesy of Danger Inc., r=dbaron, sr=bzbarsky


git-svn-id: svn://10.0.0.236/trunk@195051 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jag%tty.nl
2006-04-21 11:13:41 +00:00
parent 0b54e32cf9
commit 8897e07fdd
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11260,11 +11260,16 @@ nsCSSFrameConstructor::FindFrameWithContent(nsFrameManager* aFrameManager,
// Search for the frame in each child list that aParentFrame supports
nsIAtom* listName = nsnull;
PRInt32 listIndex = 0;
PRBool searchAgain;
do {
#ifdef NOISY_FINDFRAME
FFWC_doLoop++;
#endif
nsIFrame* kidFrame=nsnull;
nsIFrame* kidFrame = nsnull;
searchAgain = PR_FALSE;
// if we were given an hint, try to use it here to find a good
// previous frame to start our search (|kidFrame|).
if (aHint) {
@@ -11356,17 +11361,20 @@ nsCSSFrameConstructor::FindFrameWithContent(nsFrameManager* aFrameManager,
}
if (aHint) {
// If we get here, and we had a hint, then we didn't find a
// frame. The hint may have been a floated or absolutely
// positioned frame, in which case we'd be off in the weeds
// looking through something other than primary frame
// list. Reboot the search from scratch, without the hint, but
// using the null child list again.
// If we get here, and we had a hint, then we didn't find a frame.
// The hint may have been a frame whose location in the frame tree
// doesn't match the location of its corresponding element in the
// DOM tree, e.g. a floated or absolutely positioned frame, or e.g.
// a <col> frame, in which case we'd be off in the weeds looking
// through something other than the primary frame list.
// Reboot the search from scratch, without the hint, but using the
// null child list again.
aHint = nsnull;
searchAgain = PR_TRUE;
} else {
listName = aParentFrame->GetAdditionalChildListName(listIndex++);
}
} while(listName);
} while(listName || searchAgain);
// We didn't find a matching frame. If aFrame has a next-in-flow,
// then continue looking there