Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset a329aa4bc026; r=bustage

Browse Source
This commit is contained in:
Ms2ger 2012-03-31 13:23:37 +02:00
parent 592452bd22
commit fa526f509b
4 changed files with 5 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
layout/svg/base/src/nsSVGPatternFrame.cpp
View File

@ -580,14 +580,10 @@ nsSVGPatternFrame::ConstructCTM(const gfxRect &callerBBox,
tCTM.Scale(scale, scale);
}
const nsSVGViewBox& viewBox = GetViewBox();
if (!viewBox.IsValid()) {
return tCTM;
}
const nsSVGViewBoxRect viewBoxRect = GetViewBox().GetAnimValue();
const nsSVGViewBoxRect viewBox = GetViewBox().GetAnimValue();
if (viewBoxRect.height <= 0.0f || viewBoxRect.width <= 0.0f) {
return gfxMatrix(0.0, 0.0, 0.0, 0.0, 0.0, 0.0); // singular
if (viewBox.height <= 0.0f || viewBox.width <= 0.0f) {
return tCTM;
}
float viewportWidth, viewportHeight;
@ -606,16 +602,11 @@ nsSVGPatternFrame::ConstructCTM(const gfxRect &callerBBox,
viewportHeight =
GetLengthValue(nsSVGPatternElement::HEIGHT)->GetAnimValue(aTarget);
}
if (viewportWidth <= 0.0f || viewportHeight <= 0.0f) {
return gfxMatrix(0.0, 0.0, 0.0, 0.0, 0.0, 0.0); // singular
}
gfxMatrix tm = nsSVGUtils::GetViewBoxTransform(
static_cast<nsSVGPatternElement*>(mContent),
viewportWidth, viewportHeight,
viewBoxRect.x, viewBoxRect.y,
viewBoxRect.width, viewBoxRect.height,
viewBox.x, viewBox.y,
viewBox.width, viewBox.height,
GetPreserveAspectRatio());
return tm * tCTM;

6
layout/svg/crashtests/740627-1.svg
View File

@ -1,6 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg">
<pattern id="test" viewBox="0 0 10 10" height="-65%">
<rect/>
</pattern>
<rect width="100" height="100" fill="url(#test)"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 182 B

6
layout/svg/crashtests/740627-2.svg
View File

@ -1,6 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg">
<pattern id="test" viewBox="0 0 10 10" width="-65%">
<rect/>
</pattern>
<rect width="100" height="100" fill="url(#test)"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 181 B

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

@ -125,5 +125,3 @@ load 713413-1.svg
load 722003-1.svg
load 725918-1.svg
load 732836-1.svg
load 740627-1.svg
load 740627-2.svg