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

Bug 753021 - Favicon shortcuts should be centered with a white background. r=bbondy

Browse Source
This commit is contained in:
Parth Mudgal 2012-07-21 16:07:30 -04:00
parent b77a37fb02
commit d726239623
1 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
widget/windows/WinUtils.cpp
View File

@ -24,6 +24,7 @@
#include "nsINetUtil.h" #include "nsINetUtil.h"
#include "nsIChannel.h" #include "nsIChannel.h"
#include "nsIObserver.h" #include "nsIObserver.h"
#include "imgIEncoder.h"
namespace mozilla { namespace mozilla {
namespace widget { namespace widget {
@ -458,13 +459,14 @@ AsyncFaviconDataReady::OnComplete(nsIURI *aFaviconURI,
if (mURLShortcut) { if (mURLShortcut) {
OnFaviconDataNotAvailable(); OnFaviconDataNotAvailable();
} }
return NS_OK; return NS_OK;
} }
nsCOMPtr<nsIFile> icoFile; nsCOMPtr<nsIFile> icoFile;
nsresult rv = FaviconHelper::GetOutputIconPath(mNewURI, icoFile, mURLShortcut); nsresult rv = FaviconHelper::GetOutputIconPath(mNewURI, icoFile, mURLShortcut);
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
nsAutoString path; nsAutoString path;
rv = icoFile->GetPath(path); rv = icoFile->GetPath(path);
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
@ -544,12 +546,38 @@ NS_IMETHODIMP AsyncWriteIconToDisk::Run()
EmptyString(), EmptyString(),
getter_AddRefs(iconStream)); getter_AddRefs(iconStream));
} else { } else {
mMimeTypeOfInputData.AssignLiteral("image/vnd.microsoft.icon"); nsRefPtr<gfxASurface> s;
rv = imgtool->EncodeImage(container, rv = container->GetFrame(imgIContainer::FRAME_FIRST, 0, getter_AddRefs(s));
mMimeTypeOfInputData, NS_ENSURE_SUCCESS(rv, rv);
NS_LITERAL_STRING("format=bmp;bpp=32"),
getter_AddRefs(iconStream)); gfxImageSurface* surface =
new gfxImageSurface(gfxIntSize(48, 48),
gfxImageSurface::ImageFormatARGB32);
gfxContext context(surface);
context.SetOperator(gfxContext::OPERATOR_SOURCE);
context.SetColor(gfxRGBA(1, 1, 1, 1));
context.Rectangle(gfxRect(0, 0, 48, 48));
context.Fill();
context.Translate(gfxPoint(16, 16));
context.SetOperator(gfxContext::OPERATOR_OVER);
context.DrawSurface(s, gfxSize(16, 16));
gfxIntSize size = surface->GetSize();
nsRefPtr<imgIEncoder> encoder =
do_CreateInstance("@mozilla.org/image/encoder;2?"
"type=image/vnd.microsoft.icon");
NS_ENSURE_TRUE(encoder, NS_ERROR_FAILURE);
rv = encoder->InitFromData(surface->Data(), surface->Stride() * size.height,
size.width, size.height, surface->Stride(),
imgIEncoder::INPUT_FORMAT_HOSTARGB, EmptyString());
NS_ENSURE_SUCCESS(rv, rv);
CallQueryInterface(encoder.get(), getter_AddRefs(iconStream));
if (!iconStream) {
return NS_ERROR_FAILURE;
} }
}
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIFile> icoFile nsCOMPtr<nsIFile> icoFile
= do_CreateInstance("@mozilla.org/file/local;1"); = do_CreateInstance("@mozilla.org/file/local;1");