mirrors/gecko-dev
1
0
Fork 1
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-10-29 23:46:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bug 1974901: Reject all errors that occur in CacheFavicon by Promise. a=pascalc

Browse source 
Original Revision: https://phabricator.services.mozilla.com/D255887

Differential Revision: https://phabricator.services.mozilla.com/D256200
This commit is contained in:
dadaa 2025-07-07 08:19:34 +00:00 committed by pchevrel@mozilla.com
parent a7387ff05c
commit b088df28c7
1 changed files with 15 additions and 7 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

22
widget/windows/WinUtils.cpp
View file

@ -713,7 +713,9 @@ static nsresult CacheFavicon(
aPromiseHolder) { aPromiseHolder) {
nsresult rv = NS_OK; nsresult rv = NS_OK;
auto guard = MakeScopeExit([&]() { auto guard = MakeScopeExit([&]() {
if (NS_FAILED(rv) && aPromiseHolder) { MOZ_ASSERT(NS_FAILED(rv));
if (aPromiseHolder) {
aPromiseHolder->RejectIfExists(rv, __func__); aPromiseHolder->RejectIfExists(rv, __func__);
} }
}); });
@ -752,7 +754,9 @@ static nsresult CacheFavicon(
RefPtr<SourceSurface> surface = container->GetFrame( RefPtr<SourceSurface> surface = container->GetFrame(
imgIContainer::FRAME_FIRST, imgIContainer::FRAME_FIRST,
imgIContainer::FLAG_SYNC_DECODE | imgIContainer::FLAG_ASYNC_NOTIFY); imgIContainer::FLAG_SYNC_DECODE | imgIContainer::FLAG_ASYNC_NOTIFY);
NS_ENSURE_TRUE(surface, NS_ERROR_FAILURE); if (MOZ_UNLIKELY(!surface)) {
return (rv = NS_ERROR_FAILURE);
}
RefPtr<DataSourceSurface> dataSurface; RefPtr<DataSourceSurface> dataSurface;
IntSize size; IntSize size;
@ -764,11 +768,13 @@ static nsresult CacheFavicon(
size.height = std::max(surface->GetSize().height, 48); size.height = std::max(surface->GetSize().height, 48);
dataSurface = dataSurface =
Factory::CreateDataSourceSurface(size, SurfaceFormat::B8G8R8A8); Factory::CreateDataSourceSurface(size, SurfaceFormat::B8G8R8A8);
NS_ENSURE_TRUE(dataSurface, NS_ERROR_FAILURE); if (MOZ_UNLIKELY(!dataSurface)) {
return (rv = NS_ERROR_FAILURE);
}
DataSourceSurface::MappedSurface map; DataSourceSurface::MappedSurface map;
if (!dataSurface->Map(DataSourceSurface::MapType::WRITE, &map)) { if (!dataSurface->Map(DataSourceSurface::MapType::WRITE, &map)) {
return NS_ERROR_FAILURE; return (rv = NS_ERROR_FAILURE);
} }
RefPtr<DrawTarget> dt = Factory::CreateDrawTargetForData( RefPtr<DrawTarget> dt = Factory::CreateDrawTargetForData(
@ -776,7 +782,7 @@ static nsresult CacheFavicon(
dataSurface->GetFormat()); dataSurface->GetFormat());
if (!dt) { if (!dt) {
gfxWarning() << "CreateDrawTargetForData failed in CacheFavicon"; gfxWarning() << "CreateDrawTargetForData failed in CacheFavicon";
return NS_ERROR_OUT_OF_MEMORY; return (rv = NS_ERROR_OUT_OF_MEMORY);
} }
dt->FillRect(Rect(0, 0, size.width, size.height), dt->FillRect(Rect(0, 0, size.width, size.height),
ColorPattern(ToDeviceColor(sRGBColor::OpaqueWhite()))); ColorPattern(ToDeviceColor(sRGBColor::OpaqueWhite())));
@ -801,14 +807,16 @@ static nsresult CacheFavicon(
size.width = surface->GetSize().width; size.width = surface->GetSize().width;
size.height = surface->GetSize().height; size.height = surface->GetSize().height;
dataSurface = surface->GetDataSurface(); dataSurface = surface->GetDataSurface();
NS_ENSURE_TRUE(dataSurface, NS_ERROR_FAILURE); if (MOZ_UNLIKELY(!dataSurface)) {
return (rv = NS_ERROR_FAILURE);
}
} }
// Allocate a new buffer that we own and can use out of line in // Allocate a new buffer that we own and can use out of line in
// another thread. // another thread.
UniquePtr<uint8_t[]> data = SurfaceToPackedBGRA(dataSurface); UniquePtr<uint8_t[]> data = SurfaceToPackedBGRA(dataSurface);
if (!data) { if (!data) {
return NS_ERROR_OUT_OF_MEMORY; return (rv = NS_ERROR_OUT_OF_MEMORY);
} }
int32_t stride = 4 * size.width; int32_t stride = 4 * size.width;