Bug 1599843 - BlobURLProtocolHandler::AddDataEntryInternal is infallible. r=baku

Differential Revision: https://phabricator.services.mozilla.com/D54984

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Emilio Cobos Álvarez 2019-11-27 20:11:05 +00:00
Родитель 817696d634
Коммит 5727683cd6
1 изменённых файлов: 6 добавлений и 9 удалений

Просмотреть файл

@ -518,8 +518,8 @@ NS_IMPL_ISUPPORTS_INHERITED(ReleasingTimerHolder, Runnable, nsITimerCallback,
nsIAsyncShutdownBlocker)
template <typename T>
static nsresult AddDataEntryInternal(const nsACString& aURI, T aObject,
nsIPrincipal* aPrincipal) {
static void AddDataEntryInternal(const nsACString& aURI, T aObject,
nsIPrincipal* aPrincipal) {
MOZ_ASSERT(NS_IsMainThread(), "changing gDataTable is main-thread only");
StaticMutexAutoLock lock(sMutex);
if (!gDataTable) {
@ -530,7 +530,6 @@ static nsresult AddDataEntryInternal(const nsACString& aURI, T aObject,
BlobURLsReporter::GetJSStackForBlob(info);
gDataTable->Put(aURI, info);
return NS_OK;
}
void BlobURLProtocolHandler::Init(void) {
@ -558,8 +557,7 @@ nsresult BlobURLProtocolHandler::AddDataEntry(BlobImpl* aBlobImpl,
nsresult rv = GenerateURIString(aPrincipal, aUri);
NS_ENSURE_SUCCESS(rv, rv);
rv = AddDataEntryInternal(aUri, aBlobImpl, aPrincipal);
NS_ENSURE_SUCCESS(rv, rv);
AddDataEntryInternal(aUri, aBlobImpl, aPrincipal);
BroadcastBlobURLRegistration(aUri, aBlobImpl, aPrincipal);
return NS_OK;
@ -577,9 +575,7 @@ nsresult BlobURLProtocolHandler::AddDataEntry(MediaSource* aMediaSource,
nsresult rv = GenerateURIString(aPrincipal, aUri);
NS_ENSURE_SUCCESS(rv, rv);
rv = AddDataEntryInternal(aUri, aMediaSource, aPrincipal);
NS_ENSURE_SUCCESS(rv, rv);
AddDataEntryInternal(aUri, aMediaSource, aPrincipal);
return NS_OK;
}
@ -590,7 +586,8 @@ nsresult BlobURLProtocolHandler::AddDataEntry(const nsACString& aURI,
MOZ_ASSERT(aPrincipal);
MOZ_ASSERT(aBlobImpl);
return AddDataEntryInternal(aURI, aBlobImpl, aPrincipal);
AddDataEntryInternal(aURI, aBlobImpl, aPrincipal);
return NS_OK;
}
/* static */