mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-15 06:15:43 +00:00
Fix crash when closing a tab that contains an image (bug 294630). Patch by bz / beaufour, r+sr=me, a=dbaron.
This commit is contained in:
parent
1aaa75f71c
commit
a13c8de744
@ -292,19 +292,21 @@ nsImageDocument::StartDocumentLoad(const char* aCommand,
|
||||
void
|
||||
nsImageDocument::Destroy()
|
||||
{
|
||||
// Remove our event listener from the image content.
|
||||
if (mImageResizingEnabled) {
|
||||
nsCOMPtr<nsIDOMEventTarget> target = do_QueryInterface(mImageContent);
|
||||
target->RemoveEventListener(NS_LITERAL_STRING("click"), this, PR_FALSE);
|
||||
}
|
||||
if (mImageContent) {
|
||||
// Remove our event listener from the image content.
|
||||
if (mImageResizingEnabled) {
|
||||
nsCOMPtr<nsIDOMEventTarget> target = do_QueryInterface(mImageContent);
|
||||
target->RemoveEventListener(NS_LITERAL_STRING("click"), this, PR_FALSE);
|
||||
}
|
||||
|
||||
// Break reference cycle with mImageContent, if we have one
|
||||
nsCOMPtr<nsIImageLoadingContent> imageLoader = do_QueryInterface(mImageContent);
|
||||
if (imageLoader) {
|
||||
imageLoader->RemoveObserver(this);
|
||||
}
|
||||
// Break reference cycle with mImageContent, if we have one
|
||||
nsCOMPtr<nsIImageLoadingContent> imageLoader = do_QueryInterface(mImageContent);
|
||||
if (imageLoader) {
|
||||
imageLoader->RemoveObserver(this);
|
||||
}
|
||||
|
||||
mImageContent = nsnull;
|
||||
mImageContent = nsnull;
|
||||
}
|
||||
|
||||
nsMediaDocument::Destroy();
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user