Macintosh-SW
/
tenfourfox
mirror of https://github.com/classilla/tenfourfox.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

closes #484: wallpaper unrenderable icons getting into Cocoa menus

This commit is contained in:
Cameron Kaiser 2018-04-10 15:51:24 -07:00
parent 1f117b494f
commit bf5087fe2b
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
widget/cocoa/nsMenuItemIconX.mm
View File

@ -48,6 +48,11 @@ using mozilla::gfx::SourceSurface;
static const uint32_t kIconWidth = 16;
static const uint32_t kIconHeight = 16;
// The transparent placeholder gets used several places.
// See TenFourFox issue 484.
static bool sInitializedPlaceholder = false;
static NSImage* sPlaceholderIconImage = nil;
typedef NS_STDCALL_FUNCPROTO(nsresult, GetRectSideMethod, nsIDOMRect,
GetBottom, (nsIDOMCSSPrimitiveValue**));
@ -296,8 +301,6 @@ nsMenuItemIconX::LoadIcon(nsIURI* aIconURI)
// position that it will be displayed when the real icon is loaded, and
// prevents it from jumping around or looking misaligned.
static bool sInitializedPlaceholder;
static NSImage* sPlaceholderIconImage;
if (!sInitializedPlaceholder) {
sInitializedPlaceholder = true;
@ -411,7 +414,16 @@ nsMenuItemIconX::OnFrameComplete(imgIRequest* aRequest)
imageContainer->GetFrame(imgIContainer::FRAME_CURRENT,
imgIContainer::FLAG_SYNC_DECODE);
if (!surface) {
[mNativeMenuItem setImage:nil];
if (MOZ_UNLIKELY(!sInitializedPlaceholder)) {
NS_WARNING("Oddly, the placeholder image was not initialized yet");
[mNativeMenuItem setImage:nil];
} else {
// This can occur with SVG images. In that case, set a dummy icon
// so that the menu isn't distorted, but still return failure, since
// this is a fallback (TenFourFox issue 484).
mImageRegionRect.SetRect(0, 0, 16, 16);
[mNativeMenuItem setImage:sPlaceholderIconImage];
}
return NS_ERROR_FAILURE;
}