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 1090916 - Ignore SVG rect radii and calculate the bounds of rounded rects using Math when we have a rectilinear transform. r=longsonr

Browse Source
This commit is contained in:
Jonathan Watt 2014-10-29 17:07:11 +00:00
parent 8d856700be
commit af27386c5e
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dom/svg/SVGRectElement.cpp
View File

@ -114,29 +114,33 @@ bool
SVGRectElement::GetGeometryBounds(Rect* aBounds, Float aStrokeWidth,
const Matrix& aTransform)
{
Rect r;
Rect rect;
Float rx, ry;
GetAnimatedLengthValues(&r.x, &r.y, &r.width, &r.height, &rx, &ry, nullptr);
GetAnimatedLengthValues(&rect.x, &rect.y, &rect.width,
&rect.height, &rx, &ry, nullptr);
if (r.IsEmpty()) {
if (rect.IsEmpty()) {
// Rendering of the element disabled
r.SetEmpty(); // make sure width/height are actually zero
*aBounds = r;
rect.SetEmpty(); // Make sure width/height are zero and not negative
*aBounds = rect; // We still want the x/y position from 'rect'
return true;
}
rx = std::max(rx, 0.0f);
ry = std::max(ry, 0.0f);
if (!aTransform.IsRectilinear()) {
// We can't ignore the radii in this case if we want tight bounds
rx = std::max(rx, 0.0f);
ry = std::max(ry, 0.0f);
if (rx != 0 || ry != 0) {
return false;
if (rx != 0 || ry != 0) {
return false;
}
}
if (aStrokeWidth > 0.f) {
r.Inflate(aStrokeWidth / 2.f);
rect.Inflate(aStrokeWidth / 2.f);
}
*aBounds = aTransform.TransformBounds(r);
*aBounds = aTransform.TransformBounds(rect);
return true;
}