corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed to explicitly create frame of type frameset or outer frame instead

Browse Source 
of using CreateFrame() which will be going away
This commit is contained in:
troy@netscape.com
1998-09-13 02:45:07 +00:00
parent 812a016172
commit 8cfd20e39b
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
layout/html/document/src/nsFrameSetFrame.cpp
View File

@@ -41,6 +41,7 @@
#include "nsHTMLBase.h"
#include "nsIDocumentLoader.h"
#include "nsGenericHTMLElement.h"
#include "nsHTMLParts.h"
// masks for mEdgeVisibility
#define LEFT_VIS 0x0001
@@ -948,9 +949,12 @@ nsHTMLFramesetFrame::Reflow(nsIPresContext& aPresContext,
nsIAtom* tag;
child->GetTag(tag);
if ((nsHTMLAtoms::frameset == tag) || (nsHTMLAtoms::frame == tag)) {
nsresult result = nsHTMLBase::CreateFrame(&aPresContext, this, child, nsnull, frame);
nsIStyleContext* kidSC = aPresContext.ResolveStyleContextFor(child, this);
nsresult result;
if (nsHTMLAtoms::frameset == tag) {
result = NS_NewHTMLFramesetFrame(child, this, frame);
childTypes[mChildCount] = FRAMESET;
nsHTMLFramesetFrame* childFrame = (nsHTMLFramesetFrame*)frame;
childFrame->SetParentFrameborder(frameborder);
@@ -958,6 +962,8 @@ nsHTMLFramesetFrame::Reflow(nsIPresContext& aPresContext,
childFrame->SetParentBorderColor(borderColor);
childBorderColors[mChildCount].Set(childFrame->GetBorderColor());
} else { // frame
result = NS_NewHTMLFrameOuterFrame(child, this, frame);
childTypes[mChildCount] = FRAME;
//
childFrameborder[mChildCount] = GetFrameBorder(child, PR_FALSE);
@@ -967,8 +973,14 @@ nsHTMLFramesetFrame::Reflow(nsIPresContext& aPresContext,
if (NS_OK != result) {
NS_RELEASE(tag);
NS_RELEASE(child);
NS_RELEASE(kidSC);
return result;
}
// Set the style context
frame->SetStyleContext(&aPresContext, kidSC);
NS_RELEASE(kidSC);
if (nsnull == lastChild) {
mFirstChild = frame;
} else {