Implement operator delete; get rid of static constructor
git-svn-id: svn://10.0.0.236/trunk@22130 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -102,7 +102,7 @@ NS_LAYOUT PRBool nsIFrame::GetShowFrameBorders()
|
||||
* Note: the log module is created during library initialization which
|
||||
* means that you cannot perform logging before then.
|
||||
*/
|
||||
PRLogModuleInfo* nsIFrame::gLogModule = PR_NewLogModule("frame");
|
||||
static PRLogModuleInfo* gLogModule;
|
||||
|
||||
static PRLogModuleInfo* gFrameVerifyTreeLogModuleInfo;
|
||||
|
||||
@@ -133,6 +133,9 @@ nsIFrame::SetVerifyTreeEnable(PRBool aEnabled)
|
||||
NS_LAYOUT PRLogModuleInfo*
|
||||
nsIFrame::GetLogModuleInfo()
|
||||
{
|
||||
if (nsnull == gLogModule) {
|
||||
gLogModule = PR_NewLogModule("frame");
|
||||
}
|
||||
return gLogModule;
|
||||
}
|
||||
|
||||
@@ -158,12 +161,18 @@ NS_NewEmptyFrame(nsIFrame** aInstancePtrResult)
|
||||
|
||||
void* nsFrame::operator new(size_t size)
|
||||
{
|
||||
void* result = new char[size];
|
||||
|
||||
nsCRT::zero(result, size);
|
||||
void* result = ::operator new(size);
|
||||
if (result) {
|
||||
nsCRT::zero(result, size);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
void nsFrame::operator delete(void* ptr, size_t size)
|
||||
{
|
||||
::operator delete(ptr);
|
||||
}
|
||||
|
||||
nsFrame::nsFrame()
|
||||
{
|
||||
mState = NS_FRAME_FIRST_REFLOW | NS_FRAME_SYNC_FRAME_AND_VIEW;
|
||||
|
||||
Reference in New Issue
Block a user