зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1656099 - Fix formatting r=aosmond
Depends on D85503 Differential Revision: https://phabricator.services.mozilla.com/D85504
This commit is contained in:
Родитель
5f16fbcc7b
Коммит
d143e89e7f
|
@ -2119,8 +2119,7 @@ imgLoader::LoadImageXPCOM(
|
||||||
}
|
}
|
||||||
|
|
||||||
static void MakeRequestStaticIfNeeded(
|
static void MakeRequestStaticIfNeeded(
|
||||||
Document* aLoadingDocument,
|
Document* aLoadingDocument, imgRequestProxy** aProxyAboutToGetReturned) {
|
||||||
imgRequestProxy** aProxyAboutToGetReturned) {
|
|
||||||
if (!aLoadingDocument || !aLoadingDocument->IsStaticDocument()) {
|
if (!aLoadingDocument || !aLoadingDocument->IsStaticDocument()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -2157,9 +2156,8 @@ nsresult imgLoader::LoadImage(
|
||||||
return NS_ERROR_NULL_POINTER;
|
return NS_ERROR_NULL_POINTER;
|
||||||
}
|
}
|
||||||
|
|
||||||
auto makeStaticIfNeeded = mozilla::MakeScopeExit([&] {
|
auto makeStaticIfNeeded = mozilla::MakeScopeExit(
|
||||||
MakeRequestStaticIfNeeded(aLoadingDocument, _retval);
|
[&] { MakeRequestStaticIfNeeded(aLoadingDocument, _retval); });
|
||||||
});
|
|
||||||
|
|
||||||
#ifdef MOZ_GECKO_PROFILER
|
#ifdef MOZ_GECKO_PROFILER
|
||||||
AUTO_PROFILER_LABEL_DYNAMIC_NSCSTRING("imgLoader::LoadImage", NETWORK,
|
AUTO_PROFILER_LABEL_DYNAMIC_NSCSTRING("imgLoader::LoadImage", NETWORK,
|
||||||
|
@ -2519,9 +2517,8 @@ nsresult imgLoader::LoadImageWithChannel(nsIChannel* channel,
|
||||||
|
|
||||||
MOZ_ASSERT(NS_UsePrivateBrowsing(channel) == mRespectPrivacy);
|
MOZ_ASSERT(NS_UsePrivateBrowsing(channel) == mRespectPrivacy);
|
||||||
|
|
||||||
auto makeStaticIfNeeded = mozilla::MakeScopeExit([&] {
|
auto makeStaticIfNeeded = mozilla::MakeScopeExit(
|
||||||
MakeRequestStaticIfNeeded(aLoadingDocument, _retval);
|
[&] { MakeRequestStaticIfNeeded(aLoadingDocument, _retval); });
|
||||||
});
|
|
||||||
|
|
||||||
LOG_SCOPE(gImgLog, "imgLoader::LoadImageWithChannel");
|
LOG_SCOPE(gImgLog, "imgLoader::LoadImageWithChannel");
|
||||||
RefPtr<imgRequest> request;
|
RefPtr<imgRequest> request;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче