зеркало из https://github.com/mozilla/pjs.git
Eliminated NewFrame
This commit is contained in:
kipp%netscape.com
Родитель
06f4321aef
Коммит
ae98b19f78
|
|
@ -208,9 +208,9 @@ nsIFrame::GetLogModuleInfo()
|
|||
static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID);
|
||||
|
||||
nsresult
|
||||
nsFrame::NewFrame(nsIFrame** aInstancePtrResult,
|
||||
nsIContent* aContent,
|
||||
nsIFrame* aParent)
|
||||
NS_NewEmptyFrame(nsIFrame** aInstancePtrResult,
|
||||
nsIContent* aContent,
|
||||
nsIFrame* aParent)
|
||||
{
|
||||
NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
|
||||
if (nsnull == aInstancePtrResult) {
|
||||
|
|
|
|||
|
|
@ -101,9 +101,9 @@ public:
|
|||
* Create a new "empty" frame that maps a given piece of content into a
|
||||
* 0,0 area.
|
||||
*/
|
||||
static nsresult NewFrame(nsIFrame** aInstancePtrResult,
|
||||
nsIContent* aContent,
|
||||
nsIFrame* aParent);
|
||||
friend nsresult NS_NewEmptyFrame(nsIFrame** aInstancePtrResult,
|
||||
nsIContent* aContent,
|
||||
nsIFrame* aParent);
|
||||
|
||||
// Overloaded new operator. Initializes the memory to 0
|
||||
void* operator new(size_t size);
|
||||
|
|
|
|||
|
|
@ -171,7 +171,8 @@ nsHTMLContainerFrame::CreatePlaceholderFrame(nsIPresContext& aPresContext,
|
|||
aFloatedFrame->GetContent(content);
|
||||
|
||||
nsPlaceholderFrame* placeholder;
|
||||
nsPlaceholderFrame::NewFrame((nsIFrame**)&placeholder, content, this, aFloatedFrame);
|
||||
NS_NewPlaceholderFrame((nsIFrame**)&placeholder, content, this,
|
||||
aFloatedFrame);
|
||||
NS_IF_RELEASE(content);
|
||||
|
||||
// Let the placeholder share the same style context as the floated element
|
||||
|
|
@ -191,7 +192,7 @@ nsHTMLContainerFrame::CreateAbsolutePlaceholderFrame(nsIPresContext& aPresContex
|
|||
aAbsoluteFrame->GetContent(content);
|
||||
|
||||
nsAbsoluteFrame* placeholder;
|
||||
nsAbsoluteFrame::NewFrame((nsIFrame**)&placeholder, content, this, aAbsoluteFrame);
|
||||
NS_NewAbsoluteFrame((nsIFrame**)&placeholder, content, this, aAbsoluteFrame);
|
||||
NS_IF_RELEASE(content);
|
||||
|
||||
// Let the placeholder share the same style context as the floated element
|
||||
|
|
|
|||
|
|
@ -23,10 +23,10 @@
|
|||
#include "nsHTMLIIDs.h"
|
||||
|
||||
nsresult
|
||||
nsAbsoluteFrame::NewFrame(nsIFrame** aInstancePtrResult,
|
||||
nsIContent* aContent,
|
||||
nsIFrame* aParent,
|
||||
nsIFrame* aAbsoluteFrame)
|
||||
NS_NewAbsoluteFrame(nsIFrame** aInstancePtrResult,
|
||||
nsIContent* aContent,
|
||||
nsIFrame* aParent,
|
||||
nsIFrame* aAbsoluteFrame)
|
||||
{
|
||||
NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
|
||||
if (nsnull == aInstancePtrResult) {
|
||||
|
|
|
|||
|
|
@ -30,10 +30,10 @@ public:
|
|||
*
|
||||
* @see #GetAbsoluteFrame()
|
||||
*/
|
||||
static nsresult NewFrame(nsIFrame** aInstancePtrResult,
|
||||
nsIContent* aContent,
|
||||
nsIFrame* aParent,
|
||||
nsIFrame* aAbsoluteFrame = nsnull);
|
||||
friend nsresult NS_NewAbsoluteFrame(nsIFrame** aInstancePtrResult,
|
||||
nsIContent* aContent,
|
||||
nsIFrame* aParent,
|
||||
nsIFrame* aAbsoluteFrame = nsnull);
|
||||
|
||||
// Returns the associated anchored item
|
||||
nsIFrame* GetAbsoluteFrame() const {return mFrame;}
|
||||
|
|
|
|||
|
|
@ -208,9 +208,9 @@ nsIFrame::GetLogModuleInfo()
|
|||
static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID);
|
||||
|
||||
nsresult
|
||||
nsFrame::NewFrame(nsIFrame** aInstancePtrResult,
|
||||
nsIContent* aContent,
|
||||
nsIFrame* aParent)
|
||||
NS_NewEmptyFrame(nsIFrame** aInstancePtrResult,
|
||||
nsIContent* aContent,
|
||||
nsIFrame* aParent)
|
||||
{
|
||||
NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
|
||||
if (nsnull == aInstancePtrResult) {
|
||||
|
|
|
|||
|
|
@ -101,9 +101,9 @@ public:
|
|||
* Create a new "empty" frame that maps a given piece of content into a
|
||||
* 0,0 area.
|
||||
*/
|
||||
static nsresult NewFrame(nsIFrame** aInstancePtrResult,
|
||||
nsIContent* aContent,
|
||||
nsIFrame* aParent);
|
||||
friend nsresult NS_NewEmptyFrame(nsIFrame** aInstancePtrResult,
|
||||
nsIContent* aContent,
|
||||
nsIFrame* aParent);
|
||||
|
||||
// Overloaded new operator. Initializes the memory to 0
|
||||
void* operator new(size_t size);
|
||||
|
|
|
|||
|
|
@ -171,7 +171,8 @@ nsHTMLContainerFrame::CreatePlaceholderFrame(nsIPresContext& aPresContext,
|
|||
aFloatedFrame->GetContent(content);
|
||||
|
||||
nsPlaceholderFrame* placeholder;
|
||||
nsPlaceholderFrame::NewFrame((nsIFrame**)&placeholder, content, this, aFloatedFrame);
|
||||
NS_NewPlaceholderFrame((nsIFrame**)&placeholder, content, this,
|
||||
aFloatedFrame);
|
||||
NS_IF_RELEASE(content);
|
||||
|
||||
// Let the placeholder share the same style context as the floated element
|
||||
|
|
@ -191,7 +192,7 @@ nsHTMLContainerFrame::CreateAbsolutePlaceholderFrame(nsIPresContext& aPresContex
|
|||
aAbsoluteFrame->GetContent(content);
|
||||
|
||||
nsAbsoluteFrame* placeholder;
|
||||
nsAbsoluteFrame::NewFrame((nsIFrame**)&placeholder, content, this, aAbsoluteFrame);
|
||||
NS_NewAbsoluteFrame((nsIFrame**)&placeholder, content, this, aAbsoluteFrame);
|
||||
NS_IF_RELEASE(content);
|
||||
|
||||
// Let the placeholder share the same style context as the floated element
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ NS_NewWBRFrame(nsIContent* aContent,
|
|||
nsIFrame*& aResult)
|
||||
{
|
||||
nsIFrame* frame = nsnull;
|
||||
nsresult rv = nsFrame::NewFrame(&frame, aContent, aParentFrame);
|
||||
nsresult rv = NS_NewEmptyFrame(&frame, aContent, aParentFrame);
|
||||
if (NS_OK != rv) {
|
||||
return rv;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -176,7 +176,7 @@ NS_NewCommentFrame(nsIContent* aContent,
|
|||
nsIFrame*& aResult)
|
||||
{
|
||||
nsIFrame* frame;
|
||||
nsFrame::NewFrame(&frame, aContent, aParentFrame);
|
||||
NS_NewEmptyFrame(&frame, aContent, aParentFrame);
|
||||
if (nsnull == frame) {
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
}
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче