Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-27 21:00:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 1f22cefbef23 (bug 1092125) for M3 bustage on CLOSED TREE

Browse Source
This commit is contained in:
Nigel Babu 2015-09-02 11:34:47 +05:30
parent f17680c0bd
commit 4fbb4e903e
18 changed files with 64 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dom/svg/SVGCircleElement.cpp
View File

@ -83,38 +83,26 @@ SVGCircleElement::GetLengthInfo()
// nsSVGPathGeometryElement methods
bool
SVGCircleElement::GetGeometryBounds(Rect* aBounds,
const StrokeOptions& aStrokeOptions,
const Matrix& aToBoundsSpace,
const Matrix* aToNonScalingStrokeSpace)
SVGCircleElement::GetGeometryBounds(
Rect* aBounds, const StrokeOptions& aStrokeOptions, const Matrix& aTransform)
{
float x, y, r;
GetAnimatedLengthValues(&x, &y, &r, nullptr);
if (r <= 0.f) {
// Rendering of the element is disabled
*aBounds = Rect(aToBoundsSpace * Point(x, y), Size());
*aBounds = Rect(aTransform * Point(x, y), Size());
return true;
}
if (aToBoundsSpace.IsRectilinear()) {
if (aTransform.IsRectilinear()) {
// Optimize the case where we can treat the circle as a rectangle and
// still get tight bounds.
if (aStrokeOptions.mLineWidth > 0.f) {
if (aToNonScalingStrokeSpace) {
if (aToNonScalingStrokeSpace->IsRectilinear()) {
Rect userBounds(x - r, y - r, 2 * r, 2 * r);
SVGContentUtils::RectilinearGetStrokeBounds(
userBounds, aToBoundsSpace, *aToNonScalingStrokeSpace,
aStrokeOptions.mLineWidth, aBounds);
return true;
}
return false;
}
r += aStrokeOptions.mLineWidth / 2.f;
}
Rect rect(x - r, y - r, 2 * r, 2 * r);
*aBounds = aToBoundsSpace.TransformBounds(rect);
*aBounds = aTransform.TransformBounds(rect);
return true;
}

3
dom/svg/SVGCircleElement.h
View File

@ -32,8 +32,7 @@ public:
// nsSVGPathGeometryElement methods:
virtual bool GetGeometryBounds(Rect* aBounds, const StrokeOptions& aStrokeOptions,
const Matrix& aToBoundsSpace,
const Matrix* aToNonScalingStrokeSpace = nullptr) override;
const Matrix& aTransform) override;
virtual already_AddRefed<Path> BuildPath(PathBuilder* aBuilder) override;
virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const override;

39
dom/svg/SVGContentUtils.cpp
View File

@ -464,45 +464,6 @@ SVGContentUtils::GetCTM(nsSVGElement *aElement, bool aScreenCTM)
return GetCTMInternal(aElement, aScreenCTM, false);
}
void
SVGContentUtils::RectilinearGetStrokeBounds(const Rect& aRect,
const Matrix& aToBoundsSpace,
const Matrix& aToNonScalingStrokeSpace,
float aStrokeWidth,
Rect* aBounds)
{
MOZ_ASSERT(aToBoundsSpace.IsRectilinear(),
"aToBoundsSpace must be rectilinear");
MOZ_ASSERT(aToNonScalingStrokeSpace.IsRectilinear(),
"aToNonScalingStrokeSpace must be rectilinear");
Matrix nonScalingToSource = aToNonScalingStrokeSpace.Inverse();
Matrix nonScalingToBounds = nonScalingToSource * aToBoundsSpace;
*aBounds = aToBoundsSpace.TransformBounds(aRect);
// Compute the amounts dx and dy that nonScalingToBounds scales a half-width
// stroke in the x and y directions, and then inflate aBounds by those amounts
// so that when aBounds is transformed back to non-scaling-stroke space
// it will map onto the correct stroked bounds.
Float dx = 0.0f;
Float dy = 0.0f;
// nonScalingToBounds is rectilinear, so either _12 and _21 are zero or _11
// and _22 are zero, and in each case the non-zero entries (from among _11,
// _12, _21, _22) simply scale the stroke width in the x and y directions.
if (FuzzyEqual(nonScalingToBounds._12, 0) &&
FuzzyEqual(nonScalingToBounds._21, 0)) {
dx = (aStrokeWidth / 2.0f) * std::abs(nonScalingToBounds._11);
dy = (aStrokeWidth / 2.0f) * std::abs(nonScalingToBounds._22);
} else {
dx = (aStrokeWidth / 2.0f) * std::abs(nonScalingToBounds._21);
dy = (aStrokeWidth / 2.0f) * std::abs(nonScalingToBounds._12);
}
aBounds->Inflate(dx, dy);
}
double
SVGContentUtils::ComputeNormalizedHypotenuse(double aWidth, double aHeight)
{

24
dom/svg/SVGContentUtils.h
View File

@ -63,8 +63,6 @@ class SVGContentUtils
{
public:
typedef mozilla::gfx::Float Float;
typedef mozilla::gfx::Matrix Matrix;
typedef mozilla::gfx::Rect Rect;
typedef mozilla::gfx::StrokeOptions StrokeOptions;
typedef mozilla::SVGAnimatedPreserveAspectRatio SVGAnimatedPreserveAspectRatio;
typedef mozilla::SVGPreserveAspectRatio SVGPreserveAspectRatio;
@ -182,23 +180,7 @@ public:
const char16_t **aParams,
uint32_t aParamsLength);
static Matrix GetCTM(nsSVGElement *aElement, bool aScreenCTM);
/**
* Gets the tight bounds-space stroke bounds of the non-scaling-stroked rect
* aRect.
* @param aToBoundsSpace transforms from source space to the space aBounds
* should be computed in. Must be rectilinear.
* @param aToNonScalingStrokeSpace transforms from source
* space to the space in which non-scaling stroke should be applied.
* Must be rectilinear.
*/
static void
RectilinearGetStrokeBounds(const Rect& aRect,
const Matrix& aToBoundsSpace,
const Matrix& aToNonScalingStrokeSpace,
float aStrokeWidth,
Rect* aBounds);
static mozilla::gfx::Matrix GetCTM(nsSVGElement *aElement, bool aScreenCTM);
/**
* Check if this is one of the SVG elements that SVG 1.1 Full says
@ -223,13 +205,13 @@ public:
/* Generate a viewbox to viewport tranformation matrix */
static Matrix
static mozilla::gfx::Matrix
GetViewBoxTransform(float aViewportWidth, float aViewportHeight,
float aViewboxX, float aViewboxY,
float aViewboxWidth, float aViewboxHeight,
const SVGAnimatedPreserveAspectRatio &aPreserveAspectRatio);
static Matrix
static mozilla::gfx::Matrix
GetViewBoxTransform(float aViewportWidth, float aViewportHeight,
float aViewboxX, float aViewboxY,
float aViewboxWidth, float aViewboxHeight,

22
dom/svg/SVGEllipseElement.cpp
View File

@ -94,39 +94,27 @@ SVGEllipseElement::GetLengthInfo()
// nsSVGPathGeometryElement methods
bool
SVGEllipseElement::GetGeometryBounds(Rect* aBounds,
const StrokeOptions& aStrokeOptions,
const Matrix& aToBoundsSpace,
const Matrix* aToNonScalingStrokeSpace)
SVGEllipseElement::GetGeometryBounds(
Rect* aBounds, const StrokeOptions& aStrokeOptions, const Matrix& aTransform)
{
float x, y, rx, ry;
GetAnimatedLengthValues(&x, &y, &rx, &ry, nullptr);
if (rx <= 0.f || ry <= 0.f) {
// Rendering of the element is disabled
*aBounds = Rect(aToBoundsSpace * Point(x, y), Size());
*aBounds = Rect(aTransform * Point(x, y), Size());
return true;
}
if (aToBoundsSpace.IsRectilinear()) {
if (aTransform.IsRectilinear()) {
// Optimize the case where we can treat the ellipse as a rectangle and
// still get tight bounds.
if (aStrokeOptions.mLineWidth > 0.f) {
if (aToNonScalingStrokeSpace) {
if (aToNonScalingStrokeSpace->IsRectilinear()) {
Rect userBounds(x - rx, y - ry, 2 * rx, 2 * ry);
SVGContentUtils::RectilinearGetStrokeBounds(
userBounds, aToBoundsSpace, *aToNonScalingStrokeSpace,
aStrokeOptions.mLineWidth, aBounds);
return true;
}
return false;
}
rx += aStrokeOptions.mLineWidth / 2.f;
ry += aStrokeOptions.mLineWidth / 2.f;
}
Rect rect(x - rx, y - ry, 2 * rx, 2 * ry);
*aBounds = aToBoundsSpace.TransformBounds(rect);
*aBounds = aTransform.TransformBounds(rect);
return true;
}

3
dom/svg/SVGEllipseElement.h
View File

@ -32,8 +32,7 @@ public:
// nsSVGPathGeometryElement methods:
virtual bool GetGeometryBounds(Rect* aBounds, const StrokeOptions& aStrokeOptions,
const Matrix& aToBoundsSpace,
const Matrix* aToNonScalingStrokeSpace = nullptr) override;
const Matrix& aTransform) override;
virtual already_AddRefed<Path> BuildPath(PathBuilder* aBuilder) override;
virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const override;

8
dom/svg/SVGImageElement.cpp
View File

@ -226,10 +226,8 @@ SVGImageElement::IsAttributeMapped(const nsIAtom* name) const
/* For the purposes of the update/invalidation logic pretend to
be a rectangle. */
bool
SVGImageElement::GetGeometryBounds(Rect* aBounds,
const StrokeOptions& aStrokeOptions,
const Matrix& aToBoundsSpace,
const Matrix* aToNonScalingStrokeSpace)
SVGImageElement::GetGeometryBounds(
Rect* aBounds, const StrokeOptions& aStrokeOptions, const Matrix& aTransform)
{
Rect rect;
GetAnimatedLengthValues(&rect.x, &rect.y, &rect.width,
@ -240,7 +238,7 @@ SVGImageElement::GetGeometryBounds(Rect* aBounds,
rect.SetEmpty(); // Make sure width/height are zero and not negative
}
*aBounds = aToBoundsSpace.TransformBounds(rect);
*aBounds = aTransform.TransformBounds(rect);
return true;
}

3
dom/svg/SVGImageElement.h
View File

@ -55,8 +55,7 @@ public:
// nsSVGPathGeometryElement methods:
virtual bool GetGeometryBounds(Rect* aBounds, const StrokeOptions& aStrokeOptions,
const Matrix& aToBoundsSpace,
const Matrix* aToNonScalingStrokeSpace = nullptr) override;
const Matrix& aTransform) override;
virtual already_AddRefed<Path> BuildPath(PathBuilder* aBuilder) override;
// nsSVGSVGElement methods:

22
dom/svg/SVGLineElement.cpp
View File

@ -148,33 +148,27 @@ SVGLineElement::BuildPath(PathBuilder* aBuilder)
}
bool
SVGLineElement::GetGeometryBounds(Rect* aBounds,
const StrokeOptions& aStrokeOptions,
const Matrix& aToBoundsSpace,
const Matrix* aToNonScalingStrokeSpace)
SVGLineElement::GetGeometryBounds(
Rect* aBounds, const StrokeOptions& aStrokeOptions, const Matrix& aTransform)
{
if (aToNonScalingStrokeSpace) {
return false;
}
float x1, y1, x2, y2;
GetAnimatedLengthValues(&x1, &y1, &x2, &y2, nullptr);
if (aStrokeOptions.mLineWidth <= 0) {
*aBounds = Rect(aToBoundsSpace * Point(x1, y1), Size());
aBounds->ExpandToEnclose(aToBoundsSpace * Point(x2, y2));
*aBounds = Rect(aTransform * Point(x1, y1), Size());
aBounds->ExpandToEnclose(aTransform * Point(x2, y2));
return true;
}
if (aStrokeOptions.mLineCap == CapStyle::ROUND) {
if (!aToBoundsSpace.IsRectilinear()) {
if (!aTransform.IsRectilinear()) {
// TODO: handle this case.
return false;
}
Rect bounds(Point(x1, y1), Size());
bounds.ExpandToEnclose(Point(x2, y2));
bounds.Inflate(aStrokeOptions.mLineWidth / 2.f);
*aBounds = aToBoundsSpace.TransformBounds(bounds);
*aBounds = aTransform.TransformBounds(bounds);
return true;
}
@ -207,9 +201,9 @@ SVGLineElement::GetGeometryBounds(Rect* aBounds,
points[2] = Point(x2 + xDelta, y2 + yDelta);
points[3] = Point(x2 - xDelta, y2 - yDelta);
*aBounds = Rect(aToBoundsSpace * points[0], Size());
*aBounds = Rect(aTransform * points[0], Size());
for (uint32_t i = 1; i < 4; ++i) {
aBounds->ExpandToEnclose(aToBoundsSpace * points[i]);
aBounds->ExpandToEnclose(aTransform * points[i]);
}
return true;
}

3
dom/svg/SVGLineElement.h
View File

@ -40,8 +40,7 @@ public:
virtual void GetAsSimplePath(SimplePath* aSimplePath) override;
virtual already_AddRefed<Path> BuildPath(PathBuilder* aBuilder) override;
virtual bool GetGeometryBounds(Rect* aBounds, const StrokeOptions& aStrokeOptions,
const Matrix& aToBoundsSpace,
const Matrix* aToNonScalingStrokeSpace = nullptr) override;
const Matrix& aTransform) override;
virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const override;

30
dom/svg/SVGRectElement.cpp
View File

@ -112,10 +112,8 @@ SVGRectElement::GetLengthInfo()
// nsSVGPathGeometryElement methods
bool
SVGRectElement::GetGeometryBounds(Rect* aBounds,
const StrokeOptions& aStrokeOptions,
const Matrix& aToBoundsSpace,
const Matrix* aToNonScalingStrokeSpace)
SVGRectElement::GetGeometryBounds(
Rect* aBounds, const StrokeOptions& aStrokeOptions, const Matrix& aTransform)
{
Rect rect;
Float rx, ry;
@ -126,11 +124,11 @@ SVGRectElement::GetGeometryBounds(Rect* aBounds,
// Rendering of the element disabled
rect.SetEmpty(); // Make sure width/height are zero and not negative
// We still want the x/y position from 'rect'
*aBounds = aToBoundsSpace.TransformBounds(rect);
*aBounds = aTransform.TransformBounds(rect);
return true;
}
if (!aToBoundsSpace.IsRectilinear()) {
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);
@ -141,28 +139,10 @@ SVGRectElement::GetGeometryBounds(Rect* aBounds,
}
if (aStrokeOptions.mLineWidth > 0.f) {
if (aToNonScalingStrokeSpace) {
if (aToNonScalingStrokeSpace->IsRectilinear()) {
rect = aToNonScalingStrokeSpace->TransformBounds(rect);
// Note that, in principle, an author could cause the corners of the
// rect to be beveled by specifying stroke-linejoin or setting
// stroke-miterlimit to be less than sqrt(2). In that very unlikely
// event the bounds that we calculate here may be too big if
// aToBoundsSpace is non-rectilinear. This is likely to be so rare it's
// not worth handling though.
rect.Inflate(aStrokeOptions.mLineWidth / 2.f);
Matrix nonScalingToBounds =
aToNonScalingStrokeSpace->Inverse() * aToBoundsSpace;
*aBounds = nonScalingToBounds.TransformBounds(rect);
return true;
}
return false;
}
// The "beveled" comment above applies here too
rect.Inflate(aStrokeOptions.mLineWidth / 2.f);
}
*aBounds = aToBoundsSpace.TransformBounds(rect);
*aBounds = aTransform.TransformBounds(rect);
return true;
}

3
dom/svg/SVGRectElement.h
View File

@ -32,8 +32,7 @@ public:
// nsSVGPathGeometryElement methods:
virtual bool GetGeometryBounds(Rect* aBounds, const StrokeOptions& aStrokeOptions,
const Matrix& aToBoundsSpace,
const Matrix* aToNonScalingStrokeSpace = nullptr) override;
const Matrix& aTransform) override;
virtual void GetAsSimplePath(SimplePath* aSimplePath) override;
virtual already_AddRefed<Path> BuildPath(PathBuilder* aBuilder = nullptr) override;

11
dom/svg/nsSVGPathGeometryElement.h
View File

@ -76,18 +76,9 @@ public:
* GetStrokedBounds on it. It also helps us avoid rounding error for simple
* shapes and simple transforms where the Moz2D Path backends can fail to
* produce the clean integer bounds that content authors expect in some cases.
*
* If |aToNonScalingStrokeSpace| is non-null then |aBounds|, which is computed
* in bounds space, has the property that it's the smallest (axis-aligned)
* rectangular bound containing the image of this shape as stroked in
* non-scaling-stroke space. (When all transforms involved are rectilinear
* the bounds of the image of |aBounds| in non-scaling-stroke space will be
* tight, but if there are non-rectilinear transforms involved then that may
* be impossible and this method will return false).
*/
virtual bool GetGeometryBounds(Rect* aBounds, const StrokeOptions& aStrokeOptions,
const Matrix& aToBoundsSpace,
const Matrix* aToNonScalingStrokeSpace = nullptr) {
const Matrix& aTransform) {
return false;
}

18
dom/svg/nsSVGPolyElement.cpp
View File

@ -122,10 +122,8 @@ nsSVGPolyElement::GetMarkPoints(nsTArray<nsSVGMark> *aMarks)
}
bool
nsSVGPolyElement::GetGeometryBounds(Rect* aBounds,
const StrokeOptions& aStrokeOptions,
const Matrix& aToBoundsSpace,
const Matrix* aToNonScalingStrokeSpace)
nsSVGPolyElement::GetGeometryBounds(
Rect* aBounds, const StrokeOptions& aStrokeOptions, const Matrix& aTransform)
{
const SVGPointList &points = mPoints.GetAnimValue();
@ -135,23 +133,23 @@ nsSVGPolyElement::GetGeometryBounds(Rect* aBounds,
return true;
}
if (aStrokeOptions.mLineWidth > 0 || aToNonScalingStrokeSpace) {
// We don't handle non-scaling-stroke or stroke-miterlimit etc. yet
if (aStrokeOptions.mLineWidth > 0) {
// We don't handle stroke-miterlimit etc. yet
return false;
}
if (aToBoundsSpace.IsRectilinear()) {
if (aTransform.IsRectilinear()) {
// We can avoid transforming each point and just transform the result.
// Important for large point lists.
Rect bounds(points[0], Size());
for (uint32_t i = 1; i < points.Length(); ++i) {
bounds.ExpandToEnclose(points[i]);
}
*aBounds = aToBoundsSpace.TransformBounds(bounds);
*aBounds = aTransform.TransformBounds(bounds);
} else {
*aBounds = Rect(aToBoundsSpace * points[0], Size());
*aBounds = Rect(aTransform * points[0], Size());
for (uint32_t i = 1; i < points.Length(); ++i) {
aBounds->ExpandToEnclose(aToBoundsSpace * points[i]);
aBounds->ExpandToEnclose(aTransform * points[i]);
}
}
return true;

3
dom/svg/nsSVGPolyElement.h
View File

@ -47,8 +47,7 @@ public:
virtual bool IsMarkable() override { return true; }
virtual void GetMarkPoints(nsTArray<nsSVGMark> *aMarks) override;
virtual bool GetGeometryBounds(Rect* aBounds, const StrokeOptions& aStrokeOptions,
const Matrix& aToBoundsSpace,
const Matrix* aToNonScalingStrokeSpace = nullptr) override;
const Matrix& aTransform) override;
// WebIDL
already_AddRefed<mozilla::DOMSVGPointList> Points();

8
dom/svg/test/bounds-helper.svg
View File

@ -39,13 +39,5 @@ text { font: 20px monospace; }
<rect x="100" y="100" width="50" height="50" fill="pink"/>
<text x="200" y="200"/>
</g>
<circle id="nonScalingStrokedCircle1" cx="0" cy="0" r="10"
transform="translate(45 130) scale(3 -2)"
fill="none" stroke="gray" stroke-width="10"
vector-effect="non-scaling-stroke"/>
<ellipse id="nonScalingStrokedEllipse1" cx="20" cy="-10" rx="5" ry="5"
transform="matrix(0 3 -2 0 0 0)"
fill="none" stroke="steelblue" stroke-width="10"
vector-effect="non-scaling-stroke" />
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

33
dom/svg/test/test_bounds.html
View File

@ -159,10 +159,13 @@ function runTest()
is(rect3aBounds.width, 108, "rect3a.getBoundingClientRect().width");
is(rect3aBounds.height, 108, "rect3a.getBoundingClientRect().height");
isWithAbsTolerance(rect3bBounds.left, 198, 0.1, "rect3b.getBoundingClientRect().left");
isWithAbsTolerance(rect3bBounds.top, 198, 0.1, "rect3b.getBoundingClientRect().top");
isWithAbsTolerance(rect3bBounds.width, 54, 0.1, "rect3b.getBoundingClientRect().width");
isWithAbsTolerance(rect3bBounds.height, 54, 0.1, "rect3b.getBoundingClientRect().height");
// Our PathExtentsToMaxStrokeExtents implementation considers the stroke
// width to be sqrt(2)*stroke-width in case the rect is rotated 45 degrees,
// so unfortunately we get slightly large results currently. Bug 1092125.
isWithAbsTolerance(rect3bBounds.left, 198, 1, "rect3b.getBoundingClientRect().left");
isWithAbsTolerance(rect3bBounds.top, 198, 1, "rect3b.getBoundingClientRect().top");
isWithAbsTolerance(rect3bBounds.width, 54, 2, "rect3b.getBoundingClientRect().width");
isWithAbsTolerance(rect3bBounds.height, 54, 2, "rect3b.getBoundingClientRect().height");
rect = new Rect(350 - 108 * sin45, 150 - 108 * sin45, 108 * sin45 * 2, 108 * sin45 * 2);
isWithAbsTolerance(rect4aBounds.left, rect.left, 0.1, "rect4a.getBoundingClientRect().left");
@ -200,28 +203,6 @@ function runTest()
is(gBounds.width, 50, "g2.getBoundingClientRect().width");
is(gBounds.height, 50, "g2.getBoundingClientRect().height");
var nonScalingStrokedCircle1Bounds =
doc.getElementById("nonScalingStrokedCircle1").getBoundingClientRect();
isWithAbsTolerance(nonScalingStrokedCircle1Bounds.left, 10, 0.15,
"nonScalingStrokedCircle1.getBoundingClientRect().left");
isWithAbsTolerance(nonScalingStrokedCircle1Bounds.top, 105, 0.15,
"nonScalingStrokedCircle1.getBoundingClientRect().top");
isWithAbsTolerance(nonScalingStrokedCircle1Bounds.width, 70, 0.15,
"nonScalingStrokedCircle1.getBoundingClientRect().width");
isWithAbsTolerance(nonScalingStrokedCircle1Bounds.height, 50, 0.15,
"nonScalingStrokedCircle1.getBoundingClientRect().height");
var nonScalingStrokedEllipse1Bounds =
doc.getElementById("nonScalingStrokedEllipse1").getBoundingClientRect();
isWithAbsTolerance(nonScalingStrokedEllipse1Bounds.left, 5, 0.15,
"nonScalingStrokedEllipse1.getBoundingClientRect().left");
isWithAbsTolerance(nonScalingStrokedEllipse1Bounds.top, 40, 0.15,
"nonScalingStrokedEllipse1.getBoundingClientRect().top");
isWithAbsTolerance(nonScalingStrokedEllipse1Bounds.width, 30, 0.15,
"nonScalingStrokedEllipse1.getBoundingClientRect().width");
isWithAbsTolerance(nonScalingStrokedEllipse1Bounds.height, 40, 0.15,
"nonScalingStrokedEllipse1.getBoundingClientRect().height");
SimpleTest.finish();
}

37
layout/svg/nsSVGPathGeometryFrame.cpp
View File

@ -470,36 +470,25 @@ nsSVGPathGeometryFrame::GetBBoxContribution(const Matrix &aToBBoxUserspace,
((aFlags & nsSVGUtils::eBBoxIncludeStroke) &&
nsSVGUtils::HasStroke(this));
SVGContentUtils::AutoStrokeOptions strokeOptions;
if (getStroke) {
SVGContentUtils::GetStrokeOptions(&strokeOptions, element,
StyleContext(), nullptr,
SVGContentUtils::eIgnoreStrokeDashing);
} else {
// Override the default line width of 1.f so that when we call
// GetGeometryBounds below the result doesn't include stroke bounds.
strokeOptions.mLineWidth = 0.f;
}
Rect simpleBounds;
bool gotSimpleBounds = false;
gfxMatrix userToOuterSVG;
if (getStroke &&
nsSVGUtils::GetNonScalingStrokeTransform(this, &userToOuterSVG)) {
Matrix moz2dUserToOuterSVG = ToMatrix(userToOuterSVG);
gotSimpleBounds = element->GetGeometryBounds(&simpleBounds,
strokeOptions,
aToBBoxUserspace,
&moz2dUserToOuterSVG);
} else {
if (!StyleSVGReset()->HasNonScalingStroke()) {
SVGContentUtils::AutoStrokeOptions strokeOptions;
strokeOptions.mLineWidth = 0.f;
if (getStroke) {
SVGContentUtils::GetStrokeOptions(&strokeOptions, element,
StyleContext(), nullptr,
SVGContentUtils::eIgnoreStrokeDashing);
}
Rect simpleBounds;
gotSimpleBounds = element->GetGeometryBounds(&simpleBounds,
strokeOptions,
aToBBoxUserspace);
if (gotSimpleBounds) {
bbox = simpleBounds;
}
}
if (gotSimpleBounds) {
bbox = simpleBounds;
} else {
if (!gotSimpleBounds) {
// Get the bounds using a Moz2D Path object (more expensive):
RefPtr<DrawTarget> tmpDT;
#ifdef XP_WIN