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

Fixing bug 84654. r=bryner sr=sfraser. image blocking should not block backgrounds if you use it

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@114539 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pavlov%netscape.com
2002-02-14 23:31:54 +00:00
parent 5a78793da8
commit 1fe130f902
6 changed files with 104 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mozilla/layout/base/nsImageLoader.cpp
View File

@@ -81,11 +81,14 @@ nsImageLoader::Destroy()
}
nsresult
nsImageLoader::Load(const nsAReadableString &aURI)
nsImageLoader::Load(nsIURI *aURI)
{
if (!mFrame)
return NS_ERROR_NOT_INITIALIZED;
if (!aURI)
return NS_ERROR_FAILURE;
nsCOMPtr<nsILoadGroup> loadGroup;
nsCOMPtr<nsIURI> uri;
nsCOMPtr<nsIURI> baseURI;
@@ -101,20 +104,11 @@ nsImageLoader::Load(const nsAReadableString &aURI)
// Get the document's loadgroup
doc->GetDocumentLoadGroup(getter_AddRefs(loadGroup));
doc->GetBaseURL(*getter_AddRefs(baseURI));
NS_NewURI(getter_AddRefs(uri), aURI, baseURI);
// NS_NewURI can fail to return a uri instance
if (uri == nsnull) {
return NS_ERROR_FAILURE;
}
if (mRequest) {
nsCOMPtr<nsIURI> oldURI;
mRequest->GetURI(getter_AddRefs(oldURI));
PRBool eq = PR_FALSE;
uri->Equals(oldURI, &eq);
aURI->Equals(oldURI, &eq);
if (eq) {
return NS_OK;
}
@@ -123,7 +117,7 @@ nsImageLoader::Load(const nsAReadableString &aURI)
nsCOMPtr<imgILoader> il(do_GetService("@mozilla.org/image/loader;1", &rv));
if (NS_FAILED(rv)) return rv;
return il->LoadImage(uri, loadGroup, NS_STATIC_CAST(imgIDecoderObserver *, this),
return il->LoadImage(aURI, loadGroup, NS_STATIC_CAST(imgIDecoderObserver *, this),
nsnull, nsIRequest::LOAD_BACKGROUND, nsnull, nsnull, getter_AddRefs(mRequest));
}