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

Eliminated NewFrame

Browse Source
This commit is contained in:
kipp@netscape.com
1998-11-14 19:28:34 +00:00
parent aaee711222
commit c93bcec93b
10 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
layout/generic/nsFrame.cpp
View File

@@ -208,9 +208,9 @@ nsIFrame::GetLogModuleInfo()
static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID); static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID);
nsresult nsresult
nsFrame::NewFrame(nsIFrame** aInstancePtrResult, NS_NewEmptyFrame(nsIFrame** aInstancePtrResult,
nsIContent* aContent, nsIContent* aContent,
nsIFrame* aParent) nsIFrame* aParent)
{ {
NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr"); NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
if (nsnull == aInstancePtrResult) { if (nsnull == aInstancePtrResult) {

6
layout/generic/nsFrame.h
View File

@@ -101,9 +101,9 @@ public:
* Create a new "empty" frame that maps a given piece of content into a * Create a new "empty" frame that maps a given piece of content into a
* 0,0 area. * 0,0 area.
*/ */
static nsresult NewFrame(nsIFrame** aInstancePtrResult, friend nsresult NS_NewEmptyFrame(nsIFrame** aInstancePtrResult,
nsIContent* aContent, nsIContent* aContent,
nsIFrame* aParent); nsIFrame* aParent);
// Overloaded new operator. Initializes the memory to 0 // Overloaded new operator. Initializes the memory to 0
void* operator new(size_t size); void* operator new(size_t size);

5
layout/generic/nsHTMLContainerFrame.cpp
View File

@@ -171,7 +171,8 @@ nsHTMLContainerFrame::CreatePlaceholderFrame(nsIPresContext& aPresContext,
aFloatedFrame->GetContent(content); aFloatedFrame->GetContent(content);
nsPlaceholderFrame* placeholder; nsPlaceholderFrame* placeholder;
nsPlaceholderFrame::NewFrame((nsIFrame**)&placeholder, content, this, aFloatedFrame); NS_NewPlaceholderFrame((nsIFrame**)&placeholder, content, this,
aFloatedFrame);
NS_IF_RELEASE(content); NS_IF_RELEASE(content);
// Let the placeholder share the same style context as the floated element // Let the placeholder share the same style context as the floated element
@@ -191,7 +192,7 @@ nsHTMLContainerFrame::CreateAbsolutePlaceholderFrame(nsIPresContext& aPresContex
aAbsoluteFrame->GetContent(content); aAbsoluteFrame->GetContent(content);
nsAbsoluteFrame* placeholder; nsAbsoluteFrame* placeholder;
nsAbsoluteFrame::NewFrame((nsIFrame**)&placeholder, content, this, aAbsoluteFrame); NS_NewAbsoluteFrame((nsIFrame**)&placeholder, content, this, aAbsoluteFrame);
NS_IF_RELEASE(content); NS_IF_RELEASE(content);
// Let the placeholder share the same style context as the floated element // Let the placeholder share the same style context as the floated element

8
layout/html/base/src/nsAbsoluteFrame.cpp
View File

@@ -23,10 +23,10 @@
#include "nsHTMLIIDs.h" #include "nsHTMLIIDs.h"
nsresult nsresult
nsAbsoluteFrame::NewFrame(nsIFrame** aInstancePtrResult, NS_NewAbsoluteFrame(nsIFrame** aInstancePtrResult,
nsIContent* aContent, nsIContent* aContent,
nsIFrame* aParent, nsIFrame* aParent,
nsIFrame* aAbsoluteFrame) nsIFrame* aAbsoluteFrame)
{ {
NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr"); NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
if (nsnull == aInstancePtrResult) { if (nsnull == aInstancePtrResult) {

8
layout/html/base/src/nsAbsoluteFrame.h
View File

@@ -30,10 +30,10 @@ public:
* *
* @see #GetAbsoluteFrame() * @see #GetAbsoluteFrame()
*/ */
static nsresult NewFrame(nsIFrame** aInstancePtrResult, friend nsresult NS_NewAbsoluteFrame(nsIFrame** aInstancePtrResult,
nsIContent* aContent, nsIContent* aContent,
nsIFrame* aParent, nsIFrame* aParent,
nsIFrame* aAbsoluteFrame = nsnull); nsIFrame* aAbsoluteFrame = nsnull);
// Returns the associated anchored item // Returns the associated anchored item
nsIFrame* GetAbsoluteFrame() const {return mFrame;} nsIFrame* GetAbsoluteFrame() const {return mFrame;}

6
layout/html/base/src/nsFrame.cpp
View File

@@ -208,9 +208,9 @@ nsIFrame::GetLogModuleInfo()
static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID); static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID);
nsresult nsresult
nsFrame::NewFrame(nsIFrame** aInstancePtrResult, NS_NewEmptyFrame(nsIFrame** aInstancePtrResult,
nsIContent* aContent, nsIContent* aContent,
nsIFrame* aParent) nsIFrame* aParent)
{ {
NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr"); NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
if (nsnull == aInstancePtrResult) { if (nsnull == aInstancePtrResult) {

6
layout/html/base/src/nsFrame.h
View File

@@ -101,9 +101,9 @@ public:
* Create a new "empty" frame that maps a given piece of content into a * Create a new "empty" frame that maps a given piece of content into a
* 0,0 area. * 0,0 area.
*/ */
static nsresult NewFrame(nsIFrame** aInstancePtrResult, friend nsresult NS_NewEmptyFrame(nsIFrame** aInstancePtrResult,
nsIContent* aContent, nsIContent* aContent,
nsIFrame* aParent); nsIFrame* aParent);
// Overloaded new operator. Initializes the memory to 0 // Overloaded new operator. Initializes the memory to 0
void* operator new(size_t size); void* operator new(size_t size);

5
layout/html/base/src/nsHTMLContainerFrame.cpp
View File

@@ -171,7 +171,8 @@ nsHTMLContainerFrame::CreatePlaceholderFrame(nsIPresContext& aPresContext,
aFloatedFrame->GetContent(content); aFloatedFrame->GetContent(content);
nsPlaceholderFrame* placeholder; nsPlaceholderFrame* placeholder;
nsPlaceholderFrame::NewFrame((nsIFrame**)&placeholder, content, this, aFloatedFrame); NS_NewPlaceholderFrame((nsIFrame**)&placeholder, content, this,
aFloatedFrame);
NS_IF_RELEASE(content); NS_IF_RELEASE(content);
// Let the placeholder share the same style context as the floated element // Let the placeholder share the same style context as the floated element
@@ -191,7 +192,7 @@ nsHTMLContainerFrame::CreateAbsolutePlaceholderFrame(nsIPresContext& aPresContex
aAbsoluteFrame->GetContent(content); aAbsoluteFrame->GetContent(content);
nsAbsoluteFrame* placeholder; nsAbsoluteFrame* placeholder;
nsAbsoluteFrame::NewFrame((nsIFrame**)&placeholder, content, this, aAbsoluteFrame); NS_NewAbsoluteFrame((nsIFrame**)&placeholder, content, this, aAbsoluteFrame);
NS_IF_RELEASE(content); NS_IF_RELEASE(content);
// Let the placeholder share the same style context as the floated element // Let the placeholder share the same style context as the floated element

2
layout/html/base/src/nsWBRFrame.cpp
View File

@@ -25,7 +25,7 @@ NS_NewWBRFrame(nsIContent* aContent,
nsIFrame*& aResult) nsIFrame*& aResult)
{ {
nsIFrame* frame = nsnull; nsIFrame* frame = nsnull;
nsresult rv = nsFrame::NewFrame(&frame, aContent, aParentFrame); nsresult rv = NS_NewEmptyFrame(&frame, aContent, aParentFrame);
if (NS_OK != rv) { if (NS_OK != rv) {
return rv; return rv;
} }

2
layout/html/content/src/nsCommentNode.cpp
View File

@@ -176,7 +176,7 @@ NS_NewCommentFrame(nsIContent* aContent,
nsIFrame*& aResult) nsIFrame*& aResult)
{ {
nsIFrame* frame; nsIFrame* frame;
nsFrame::NewFrame(&frame, aContent, aParentFrame); NS_NewEmptyFrame(&frame, aContent, aParentFrame);
if (nsnull == frame) { if (nsnull == frame) {
return NS_ERROR_OUT_OF_MEMORY; return NS_ERROR_OUT_OF_MEMORY;
} }