Bug 666446, followup - Make frameCreated and frameDestroyed methods in nsIImageLoadingContent inaccessible to script. [r=dholbert]

This commit is contained in:
Scott Johnson 2011-10-03 16:35:02 -07:00
parent 20000c7e93
commit a9a990bd2f
2 changed files with 4 additions and 8 deletions

View File

@ -133,13 +133,13 @@ interface nsIImageLoadingContent : imgIDecoderObserver
* Used to notify the image loading content node that a frame has been
* created.
*/
void frameCreated(in nsIFrame aFrame);
[notxpcom] void frameCreated(in nsIFrame aFrame);
/**
* Used to notify the image loading content node that a frame has been
* destroyed.
*/
void frameDestroyed(in nsIFrame aFrame);
[notxpcom] void frameDestroyed(in nsIFrame aFrame);
/**
* Used to find out what type of request one is dealing with (eg

View File

@ -512,7 +512,7 @@ nsImageLoadingContent::GetRequest(PRInt32 aRequestType,
return NS_OK;
}
NS_IMETHODIMP
NS_IMETHODIMP_(void)
nsImageLoadingContent::FrameCreated(nsIFrame* aFrame)
{
NS_ASSERTION(aFrame, "aFrame is null");
@ -532,11 +532,9 @@ nsImageLoadingContent::FrameCreated(nsIFrame* aFrame)
nsLayoutUtils::RegisterImageRequest(presContext, mPendingRequest,
&mPendingRequestRegistered);
}
return NS_OK;
}
NS_IMETHODIMP
NS_IMETHODIMP_(void)
nsImageLoadingContent::FrameDestroyed(nsIFrame* aFrame)
{
NS_ASSERTION(aFrame, "aFrame is null");
@ -551,8 +549,6 @@ nsImageLoadingContent::FrameDestroyed(nsIFrame* aFrame)
mPendingRequest,
&mPendingRequestRegistered);
}
return NS_OK;
}
NS_IMETHODIMP