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

Bug 369168, r+sr=roc

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@222448 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
Olli.Pettay%helsinki.fi 2007-03-27 05:30:14 +00:00
parent 1b138bb63d
commit 6be37dcb11
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mozilla/layout/generic/nsFrameSetFrame.cpp
View File

@ -1353,6 +1353,7 @@ nsHTMLFramesetFrame::CanChildResize(PRBool aVertical,
{
nsIFrame* child = mFrames.FrameAt(aChildX);
if (aFrameset) {
NS_ASSERTION(ChildIsFrameset(child), "Child frame is not a frameset!");
return ((nsHTMLFramesetFrame*)child)->CanResize(aVertical, aLeft);
} else {
return !GetNoResize(child);
@ -1373,7 +1374,7 @@ nsHTMLFramesetFrame::RecalculateBorderResize()
if (NS_UNLIKELY(!childTypes)) {
return;
}
PRUint32 childIndex, frameOrFramesetChildIndex = 0;
PRUint32 childIndex, childTypeIndex = 0;
// number of any type of children
PRUint32 numChildren = mContent->GetChildCount();
@ -1384,16 +1385,19 @@ nsHTMLFramesetFrame::RecalculateBorderResize()
nsINodeInfo *ni = child->NodeInfo();
if (ni->Equals(nsGkAtoms::frameset)) {
childTypes[frameOrFramesetChildIndex++] = FRAMESET;
childTypes[childTypeIndex++] = FRAMESET;
} else if (ni->Equals(nsGkAtoms::frame)) {
childTypes[frameOrFramesetChildIndex++] = FRAME;
childTypes[childTypeIndex++] = FRAME;
}
// Don't overflow childTypes array
if (((PRInt32)frameOrFramesetChildIndex) >= numCells) {
if (((PRInt32)childTypeIndex) >= numCells) {
break;
}
}
}
for (; childTypeIndex < numCells; ++childTypeIndex) {
childTypes[childTypeIndex] = BLANK;
}
// set the visibility and mouse sensitivity of borders
PRInt32 verX;