wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

merge backout a=bustage

Browse Source
This commit is contained in:
Matthew Gregan 2010-11-15 14:06:51 +13:00
commit 4644fd6de6
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
content/html/content/src/nsHTMLMediaElement.cpp
View File

@ -961,6 +961,9 @@ nsresult nsHTMLMediaElement::LoadResource(nsIURI* aURI)
nsRefPtr<MediaLoadListener> loadListener = new MediaLoadListener(this);
if (!loadListener) return NS_ERROR_OUT_OF_MEMORY;
// loadListener will be unregistered either on shutdown or when
// OnStartRequest fires.
nsContentUtils::RegisterShutdownObserver(loadListener);
mChannel->SetNotificationCallbacks(loadListener);
nsCOMPtr<nsIStreamListener> listener;
@ -1010,10 +1013,6 @@ nsresult nsHTMLMediaElement::LoadResource(nsIURI* aURI)
// Else the channel must be open and starting to download. If it encounters
// a non-catastrophic failure, it will set a new task to continue loading
// another candidate.
// loadListener will be unregistered either on shutdown or when
// OnStartRequest for the channel we just opened fires.
nsContentUtils::RegisterShutdownObserver(loadListener);
return NS_OK;
}