Bug 201865 Images added by script not subject to blocking

patch by mvl@exedo.nl r=dwitte sr=bz a=asa


git-svn-id: svn://10.0.0.236/trunk@141816 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
timeless%mozdev.org 2003-04-25 20:03:40 +00:00
parent 9b898d0a6b
commit 19e80768b2

View File

@ -39,6 +39,7 @@
#include "nsImgManager.h"
#include "nsIDocument.h"
#include "nsIContent.h"
#include "nsINodeInfo.h"
#include "nsCOMPtr.h"
#include "nsXPIDLString.h"
#include "nsIURI.h"
@ -143,11 +144,18 @@ NS_IMETHODIMP nsImgManager::ShouldLoad(PRInt32 aContentType,
nsCOMPtr<nsIURI> baseURI;
nsCOMPtr<nsIDocument> doc;
nsCOMPtr<nsINodeInfo> nodeinfo;
nsCOMPtr<nsIContent> content = do_QueryInterface(aContext);
NS_ASSERTION(content, "no content available");
if (content) {
rv = content->GetDocument(*getter_AddRefs(doc));
if (NS_FAILED(rv) || !doc) return rv;
if (NS_FAILED(rv) || !doc) {
rv = content->GetNodeInfo(*getter_AddRefs(nodeinfo));
if (NS_FAILED(rv) || !nodeinfo) return rv;
rv = nodeinfo->GetDocument(*getter_AddRefs(doc));
if (NS_FAILED(rv) || !doc) return rv;
}
rv = doc->GetBaseURL(*getter_AddRefs(baseURI));
if (NS_FAILED(rv) || !baseURI) return rv;