зеркало из https://github.com/mozilla/gecko-dev.git
Fixing bug 691785. r=khuey
This commit is contained in:
Родитель
c2b905ac11
Коммит
38f8b87e52
|
@ -508,7 +508,7 @@ NS_IMETHODIMP
|
|||
nsObjectLoadingContent::OnStartRequest(nsIRequest *aRequest,
|
||||
nsISupports *aContext)
|
||||
{
|
||||
if (aRequest != mChannel) {
|
||||
if (aRequest != mChannel || !aRequest) {
|
||||
// This is a bit of an edge case - happens when a new load starts before the
|
||||
// previous one got here
|
||||
return NS_BINDING_ABORTED;
|
||||
|
@ -780,6 +780,8 @@ nsObjectLoadingContent::OnStopRequest(nsIRequest *aRequest,
|
|||
nsISupports *aContext,
|
||||
nsresult aStatusCode)
|
||||
{
|
||||
NS_ENSURE_TRUE(nsContentUtils::IsCallerChrome(), NS_ERROR_NOT_AVAILABLE);
|
||||
|
||||
if (aRequest != mChannel) {
|
||||
return NS_BINDING_ABORTED;
|
||||
}
|
||||
|
@ -798,8 +800,13 @@ nsObjectLoadingContent::OnStopRequest(nsIRequest *aRequest,
|
|||
|
||||
// nsIStreamListener
|
||||
NS_IMETHODIMP
|
||||
nsObjectLoadingContent::OnDataAvailable(nsIRequest *aRequest, nsISupports *aContext, nsIInputStream *aInputStream, PRUint32 aOffset, PRUint32 aCount)
|
||||
nsObjectLoadingContent::OnDataAvailable(nsIRequest *aRequest,
|
||||
nsISupports *aContext,
|
||||
nsIInputStream *aInputStream,
|
||||
PRUint32 aOffset, PRUint32 aCount)
|
||||
{
|
||||
NS_ENSURE_TRUE(nsContentUtils::IsCallerChrome(), NS_ERROR_NOT_AVAILABLE);
|
||||
|
||||
if (aRequest != mChannel) {
|
||||
return NS_BINDING_ABORTED;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче