Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 21:35:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 279922 - <svg:image> not handling renderer surface creation fail

Browse Source 
(libart).  r=pavlov
This commit is contained in:
tor%cs.brown.edu 2005-02-07 14:53:00 +00:00
parent 40888bf15f
commit 7fb6a8ebd8
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
layout/svg/base/src/nsSVGImageFrame.cpp
View File

@ -434,16 +434,28 @@ nsSVGImageFrame::ConvertFrame(gfxIImageFrame *aNewFrame)
aNewFrame->GetWidth(&width);
aNewFrame->GetHeight(&height);
nsISVGOuterSVGFrame *outerSVGFrame = GetOuterSVGFrame();
nsresult rv;
nsCOMPtr<nsISVGRenderer> renderer;
outerSVGFrame->GetRenderer(getter_AddRefs(renderer));
renderer->CreateSurface(width, height, getter_AddRefs(mSurface));
nsISVGOuterSVGFrame *outerSVGFrame = GetOuterSVGFrame();
if (!outerSVGFrame)
return NS_ERROR_FAILURE;
rv = outerSVGFrame->GetRenderer(getter_AddRefs(renderer));
if (NS_FAILED(rv))
return rv;
rv = renderer->CreateSurface(width, height, getter_AddRefs(mSurface));
if (NS_FAILED(rv))
return rv;
PRUint8 *data, *target;
PRUint32 length;
PRInt32 stride;
mSurface->Lock();
mSurface->GetData(&data, &length, &stride);
if (!data) {
mSurface->Unlock();
return NS_ERROR_FAILURE;
}
#ifdef XP_WIN
stride = -stride;
#endif
@ -455,7 +467,13 @@ nsSVGImageFrame::ConvertFrame(gfxIImageFrame *aNewFrame)
PRUint32 bpr, abpr;
aNewFrame->GetImageData(&rgb, &length);
aNewFrame->GetImageBytesPerRow(&bpr);
if (!rgb) {
mSurface->Unlock();
aNewFrame->UnlockImageData();
aNewFrame->UnlockAlphaData();
return NS_ERROR_FAILURE;
}
aNewFrame->GetAlphaData(&alpha, &length);
aNewFrame->GetAlphaBytesPerRow(&abpr);