bug 857906 progress indicator spinning on multipart motion jpeg r=duell sr=bz

This commit is contained in:
Patrick McManus
2013-04-09 13:38:48 -04:00
parent 8da7065003
commit 624abd0c3c
6 changed files with 115 additions and 17 deletions

View File

@@ -15,6 +15,7 @@
#include "nsIStringBundle.h"
#include "nsIStreamListenerTee.h"
#include "nsISeekableStream.h"
#include "nsILoadGroupChild.h"
#include "nsMimeTypes.h"
#include "nsNetUtil.h"
#include "prprf.h"
@@ -684,23 +685,20 @@ nsHttpChannel::SetupTransactionLoadGroupInfo()
// Find the loadgroup at the end of the chain in order
// to make sure all channels derived from the load group
// use the same connection scope.
nsCOMPtr<nsILoadGroup> rootLoadGroup = mLoadGroup;
while (rootLoadGroup) {
nsCOMPtr<nsILoadGroup> tmp;
rootLoadGroup->GetLoadGroup(getter_AddRefs(tmp));
if (tmp)
rootLoadGroup.swap(tmp);
else
break;
}
nsCOMPtr<nsILoadGroupChild> childLoadGroup = do_QueryInterface(mLoadGroup);
if (!childLoadGroup)
return;
nsCOMPtr<nsILoadGroup> rootLoadGroup;
childLoadGroup->GetRootLoadGroup(getter_AddRefs(rootLoadGroup));
if (!rootLoadGroup)
return;
// Set the load group connection scope on the transaction
if (rootLoadGroup) {
nsCOMPtr<nsILoadGroupConnectionInfo> ci;
rootLoadGroup->GetConnectionInfo(getter_AddRefs(ci));
if (ci)
mTransaction->SetLoadGroupConnectionInfo(ci);
}
nsCOMPtr<nsILoadGroupConnectionInfo> ci;
rootLoadGroup->GetConnectionInfo(getter_AddRefs(ci));
if (ci)
mTransaction->SetLoadGroupConnectionInfo(ci);
}
nsresult