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

Removed asserts now that nsScrollbarFrame correctly implements its QI. Fixed memory leaks with scrollbars by nsCOMPtr'izing stuff. r=pavlov.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@56936 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pinkerton%netscape.com 2000-01-06 05:55:46 +00:00
parent 26f34c3238
commit 5ca1ed52b2
2 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mozilla/layout/generic/nsGfxScrollFrame.cpp
View File

@ -1643,23 +1643,17 @@ nsGfxScrollFrame::GetBoxInfo(nsIPresContext* aPresContext, const nsHTMLReflowSta
nsresult rv;
nsBoxInfo scrollAreaInfo, vboxInfo, hboxInfo;
nsIBox* ibox = nsnull;
rv = mInner->mScrollAreaFrame->QueryInterface(nsIBox::GetIID(), (void**)&ibox);
nsCOMPtr<nsIBox> ibox ( do_QueryInterface(mInner->mScrollAreaFrame) );
if (ibox) ibox->GetBoxInfo(aPresContext, aReflowState, scrollAreaInfo);
NS_ASSERTION(NS_SUCCEEDED(rv),"Scrollarea must implement box!!");
if (mInner->mHasVerticalScrollbar) {
ibox = nsnull;
mInner->mVScrollbarFrame->QueryInterface(nsIBox::GetIID(), (void**)&ibox);
if (ibox) ibox->GetBoxInfo(aPresContext, aReflowState, vboxInfo);
NS_ASSERTION(NS_SUCCEEDED(rv),"Scrollarea must implement box!!");
nsCOMPtr<nsIBox> vScrollbarBox ( do_QueryInterface(mInner->mVScrollbarFrame) );
if (vScrollbarBox) vScrollbarBox->GetBoxInfo(aPresContext, aReflowState, vboxInfo);
}
if (mInner->mHasHorizontalScrollbar) {
ibox = nsnull;
mInner->mHScrollbarFrame->QueryInterface(nsIBox::GetIID(), (void**)&ibox);
if (ibox) ibox->GetBoxInfo(aPresContext, aReflowState, hboxInfo);
NS_ASSERTION(NS_SUCCEEDED(rv),"Scrollarea must implement box!!");
nsCOMPtr<nsIBox> hScrollbarBox ( do_QueryInterface(mInner->mHScrollbarFrame) );
if (hScrollbarBox) hScrollbarBox->GetBoxInfo(aPresContext, aReflowState, hboxInfo);
}
aSize.prefSize.width += scrollAreaInfo.prefSize.width + vboxInfo.prefSize.width;
@ -1766,11 +1760,10 @@ nsGfxScrollFrame::Dirty(nsIPresContext* aPresContext, const nsHTMLReflowState& a
else if (frame == mInner->mScrollAreaFrame)
mInner->mScrollAreaNeedsReflow = PR_TRUE;
nsIBox* ibox = nsnull;
rv = childFrame->QueryInterface(nsIBox::GetIID(), (void**)&ibox);
nsCOMPtr<nsIBox> ibox ( do_QueryInterface(childFrame, &rv) );
NS_ASSERTION(NS_SUCCEEDED(rv),"We have a child that is not a box!!!!");
if (NS_FAILED(rv))
return rv;
return rv;
if (ibox) ibox->Dirty(aPresContext, aReflowState, incrementalChild);
break;

21
mozilla/layout/html/base/src/nsGfxScrollFrame.cpp
View File

@ -1643,23 +1643,17 @@ nsGfxScrollFrame::GetBoxInfo(nsIPresContext* aPresContext, const nsHTMLReflowSta
nsresult rv;
nsBoxInfo scrollAreaInfo, vboxInfo, hboxInfo;
nsIBox* ibox = nsnull;
rv = mInner->mScrollAreaFrame->QueryInterface(nsIBox::GetIID(), (void**)&ibox);
nsCOMPtr<nsIBox> ibox ( do_QueryInterface(mInner->mScrollAreaFrame) );
if (ibox) ibox->GetBoxInfo(aPresContext, aReflowState, scrollAreaInfo);
NS_ASSERTION(NS_SUCCEEDED(rv),"Scrollarea must implement box!!");
if (mInner->mHasVerticalScrollbar) {
ibox = nsnull;
mInner->mVScrollbarFrame->QueryInterface(nsIBox::GetIID(), (void**)&ibox);
if (ibox) ibox->GetBoxInfo(aPresContext, aReflowState, vboxInfo);
NS_ASSERTION(NS_SUCCEEDED(rv),"Scrollarea must implement box!!");
nsCOMPtr<nsIBox> vScrollbarBox ( do_QueryInterface(mInner->mVScrollbarFrame) );
if (vScrollbarBox) vScrollbarBox->GetBoxInfo(aPresContext, aReflowState, vboxInfo);
}
if (mInner->mHasHorizontalScrollbar) {
ibox = nsnull;
mInner->mHScrollbarFrame->QueryInterface(nsIBox::GetIID(), (void**)&ibox);
if (ibox) ibox->GetBoxInfo(aPresContext, aReflowState, hboxInfo);
NS_ASSERTION(NS_SUCCEEDED(rv),"Scrollarea must implement box!!");
nsCOMPtr<nsIBox> hScrollbarBox ( do_QueryInterface(mInner->mHScrollbarFrame) );
if (hScrollbarBox) hScrollbarBox->GetBoxInfo(aPresContext, aReflowState, hboxInfo);
}
aSize.prefSize.width += scrollAreaInfo.prefSize.width + vboxInfo.prefSize.width;
@ -1766,11 +1760,10 @@ nsGfxScrollFrame::Dirty(nsIPresContext* aPresContext, const nsHTMLReflowState& a
else if (frame == mInner->mScrollAreaFrame)
mInner->mScrollAreaNeedsReflow = PR_TRUE;
nsIBox* ibox = nsnull;
rv = childFrame->QueryInterface(nsIBox::GetIID(), (void**)&ibox);
nsCOMPtr<nsIBox> ibox ( do_QueryInterface(childFrame, &rv) );
NS_ASSERTION(NS_SUCCEEDED(rv),"We have a child that is not a box!!!!");
if (NS_FAILED(rv))
return rv;
return rv;
if (ibox) ibox->Dirty(aPresContext, aReflowState, incrementalChild);
break;