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 492186 - Crash with altGlyphDef and getBBox. r=roc

Browse Source
This commit is contained in:
Robert Longson 2009-06-17 22:29:55 +01:00
parent 7b3cd99d48
commit 52302767f0
4 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
layout/svg/base/src/nsSVGContainerFrame.cpp
View File

@ -272,8 +272,11 @@ nsSVGDisplayContainerFrame::GetBBoxContribution(const gfxMatrix &aToBBoxUserspac
gfxMatrix transform = aToBBoxUserspace;
// nsSVGGlyphFrame's mContent is a nsTextNode!
if (kid->GetType() != nsGkAtoms::svgGlyphFrame) {
transform = static_cast<nsSVGElement*>(kid->GetContent())->
PrependLocalTransformTo(aToBBoxUserspace);
nsIContent *content = kid->GetContent();
if (content->IsNodeOfType(nsINode::eSVG)) {
transform = static_cast<nsSVGElement*>(content)->
PrependLocalTransformTo(aToBBoxUserspace);
}
}
bboxUnion = bboxUnion.Union(svgKid->GetBBoxContribution(transform));
}

8
layout/svg/base/src/nsSVGSwitchFrame.cpp
View File

@ -189,8 +189,12 @@ nsSVGSwitchFrame::GetBBoxContribution(const gfxMatrix &aToBBoxUserspace)
nsIFrame* kid = GetActiveChildFrame();
nsISVGChildFrame* svgKid = do_QueryFrame(kid);
if (svgKid) {
gfxMatrix transform = static_cast<nsSVGElement*>(kid->GetContent())->
PrependLocalTransformTo(aToBBoxUserspace);
nsIContent *content = kid->GetContent();
gfxMatrix transform = aToBBoxUserspace;
if (content->IsNodeOfType(nsINode::eSVG)) {
transform = static_cast<nsSVGElement*>(content)->
PrependLocalTransformTo(aToBBoxUserspace);
}
return svgKid->GetBBoxContribution(transform);
}
return gfxRect(0.0, 0.0, 0.0, 0.0);

6
layout/svg/crashtests/492186-1.svg Normal file
View File

@ -0,0 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg">
<altGlyphDef/>
<script xmlns="http://www.w3.org/1999/xhtml">
document.documentElement.getBBox();
</script>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 155 B

1
layout/svg/crashtests/crashtests.list
View File

@ -73,4 +73,5 @@ load 472782-1.svg
load 475181-1.svg
load 475193-1.html
load 478128-1.svg
load 492186-1.svg
load extref-test-1.xhtml