Sync up branch and trunk
git-svn-id: svn://10.0.0.236/trunk@190422 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
9352850db6
commit
64d71a896b
@ -680,7 +680,10 @@ FaviconLoadListener::OnStopRequest(nsIRequest *aRequest, nsISupports *aContext,
|
||||
nsCOMPtr<nsIContentSniffer> sniffer = do_GetService(snifferCID.get(), &rv);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
sniffer->GetMIMETypeFromContent(aRequest,
|
||||
sniffer->GetMIMETypeFromContent(
|
||||
#ifndef MOZILLA_1_8_BRANCH
|
||||
aRequest,
|
||||
#endif
|
||||
NS_REINTERPRET_CAST(PRUint8*, NS_CONST_CAST(char*, mData.get())),
|
||||
mData.Length(), mimeType);
|
||||
// ignore errors: mime type will be left empty and we'll try the next sniffer
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user