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

Implementing a generalized recycler and arena for all layout frames. Hoping to improve

Browse Source 
bug #9489.  Should also definitely fix bug #15916. r=troy


git-svn-id: svn://10.0.0.236/trunk@55321 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
hyatt%netscape.com
1999-12-04 23:49:50 +00:00
parent 42c76a9aa9
commit 7e24c61109
194 changed files with 1878 additions and 1339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/layout/generic/nsObjectFrame.cpp
View File

@@ -376,8 +376,10 @@ nsObjectFrame::Init(nsIPresContext* aPresContext,
if(bImage)
{
nsCOMPtr<nsIPresShell> shell;
aPresContext->GetShell(getter_AddRefs(shell));
nsIFrame * aNewFrame = nsnull;
rv = NS_NewImageFrame(&aNewFrame);
rv = NS_NewImageFrame(shell, &aNewFrame);
if(rv != NS_OK)
return rv;
@@ -1341,13 +1343,13 @@ nsresult nsObjectFrame::GetPluginInstance(nsIPluginInstance*& aPluginInstance)
}
nsresult
NS_NewObjectFrame(nsIFrame** aNewFrame)
NS_NewObjectFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame)
{
NS_PRECONDITION(aNewFrame, "null OUT ptr");
if (nsnull == aNewFrame) {
return NS_ERROR_NULL_POINTER;
}
nsObjectFrame* it = new nsObjectFrame;
nsObjectFrame* it = new (aPresShell) nsObjectFrame;
if (nsnull == it) {
return NS_ERROR_OUT_OF_MEMORY;
}