Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-25 03:49:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 633051 - Remove LOAD_BACKGROUND flag from media channel when load completes. r=roc a=roc

Browse Source
This commit is contained in:
Matthew Gregan 2011-02-15 12:21:32 +13:00
parent c6d9c951c9
commit db0d4b9abc
2 changed files with 46 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
content/media/nsMediaStream.cpp
View File

@ -319,6 +319,20 @@ nsMediaChannelStream::OnStopRequest(nsIRequest* aRequest, nsresult aStatus)
if (!mIgnoreClose) { if (!mIgnoreClose) {
mCacheStream.NotifyDataEnded(aStatus); mCacheStream.NotifyDataEnded(aStatus);
// Move this request back into the foreground. This is necessary for
// requests owned by video documents to ensure the load group fires
// OnStopRequest when restoring from session history.
if (mLoadInBackground) {
mLoadInBackground = PR_FALSE;
nsLoadFlags loadFlags;
nsresult rv = mChannel->GetLoadFlags(&loadFlags);
NS_ASSERTION(NS_SUCCEEDED(rv), "GetLoadFlags() failed!");
loadFlags &= ~nsIRequest::LOAD_BACKGROUND;
ModifyLoadFlags(loadFlags);
}
} }
return NS_OK; return NS_OK;
@ -1155,28 +1169,40 @@ void nsMediaStream::MoveLoadsToBackground() {
NS_WARNING("Null element in nsMediaStream::MoveLoadsToBackground()"); NS_WARNING("Null element in nsMediaStream::MoveLoadsToBackground()");
return; return;
} }
nsCOMPtr<nsILoadGroup> loadGroup;
rv = mChannel->GetLoadGroup(getter_AddRefs(loadGroup));
NS_ASSERTION(NS_SUCCEEDED(rv), "GetLoadGroup() failed!");
nsresult status;
mChannel->GetStatus(&status);
// Note: if (NS_FAILED(status)), the channel won't be in the load group.
PRBool isPending = PR_FALSE;
if (loadGroup &&
NS_SUCCEEDED(status) &&
NS_SUCCEEDED(mChannel->IsPending(&isPending)) &&
isPending) {
rv = loadGroup->RemoveRequest(mChannel, nsnull, status);
NS_ASSERTION(NS_SUCCEEDED(rv), "RemoveRequest() failed!");
PRBool isPending = PR_FALSE;
if (NS_SUCCEEDED(mChannel->IsPending(&isPending)) &&
isPending) {
nsLoadFlags loadFlags; nsLoadFlags loadFlags;
rv = mChannel->GetLoadFlags(&loadFlags); rv = mChannel->GetLoadFlags(&loadFlags);
NS_ASSERTION(NS_SUCCEEDED(rv), "GetLoadFlags() failed!"); NS_ASSERTION(NS_SUCCEEDED(rv), "GetLoadFlags() failed!");
loadFlags |= nsIRequest::LOAD_BACKGROUND; loadFlags |= nsIRequest::LOAD_BACKGROUND;
rv = mChannel->SetLoadFlags(loadFlags); ModifyLoadFlags(loadFlags);
NS_ASSERTION(NS_SUCCEEDED(rv), "SetLoadFlags() failed!"); }
}
void nsMediaStream::ModifyLoadFlags(nsLoadFlags aFlags)
{
nsCOMPtr<nsILoadGroup> loadGroup;
nsresult rv = mChannel->GetLoadGroup(getter_AddRefs(loadGroup));
NS_ASSERTION(NS_SUCCEEDED(rv), "GetLoadGroup() failed!");
nsresult status;
mChannel->GetStatus(&status);
// Note: if (NS_FAILED(status)), the channel won't be in the load group.
if (loadGroup &&
NS_SUCCEEDED(status)) {
rv = loadGroup->RemoveRequest(mChannel, nsnull, status);
NS_ASSERTION(NS_SUCCEEDED(rv), "RemoveRequest() failed!");
}
rv = mChannel->SetLoadFlags(aFlags);
NS_ASSERTION(NS_SUCCEEDED(rv), "SetLoadFlags() failed!");
if (loadGroup &&
NS_SUCCEEDED(status)) {
rv = loadGroup->AddRequest(mChannel, nsnull); rv = loadGroup->AddRequest(mChannel, nsnull);
NS_ASSERTION(NS_SUCCEEDED(rv), "AddRequest() failed!"); NS_ASSERTION(NS_SUCCEEDED(rv), "AddRequest() failed!");
} }

5
content/media/nsMediaStream.h
View File

@ -285,6 +285,11 @@ protected:
MOZ_COUNT_CTOR(nsMediaStream); MOZ_COUNT_CTOR(nsMediaStream);
} }
// Set the request's load flags to aFlags. If the request is part of a
// load group, the request is removed from the group, the flags are set, and
// then the request is added back to the load group.
void ModifyLoadFlags(nsLoadFlags aFlags);
// This is not an nsCOMPointer to prevent a circular reference // This is not an nsCOMPointer to prevent a circular reference
// between the decoder to the media stream object. The stream never // between the decoder to the media stream object. The stream never
// outlives the lifetime of the decoder. // outlives the lifetime of the decoder.