wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-26 00:57:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Only create a single display transform for SVG frames with single child transforms.

Browse source 
This improves performance on repeated scaling of vectors.
This commit is contained in:
wolfbeast 2017-06-28 21:47:18 +02:00 • committed by Roy Tam
commit fafc5f0ec1
2 changed files with 36 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

40
layout/svg/nsSVGOuterSVGFrame.cpp
View file

@ -979,21 +979,43 @@ nsSVGOuterSVGAnonChildFrame::GetType() const
} }
bool bool
nsSVGOuterSVGAnonChildFrame::HasChildrenOnlyTransform(gfx::Matrix *aTransform) const nsSVGOuterSVGAnonChildFrame::IsSVGTransformed(Matrix* aOwnTransform,
Matrix* aFromParentTransform) const
{ {
// We must claim our nsSVGOuterSVGFrame's children-only transforms as our own // Our elements 'transform' attribute is applied to our nsSVGOuterSVGFrame
// so that the children we are used to wrap are transformed properly. // parent, and the element's children-only transforms are applied to us, the
// anonymous child frame. Since we are the child frame, we apply the
// children-only transforms as if they are our own transform.
SVGSVGElement* content = static_cast<SVGSVGElement*>(mContent); SVGSVGElement* content = static_cast<SVGSVGElement*>(mContent);
bool hasTransform = content->HasChildrenOnlyTransform(); if (!content->HasChildrenOnlyTransform()) {
return false;
}
if (hasTransform && aTransform) {
// Outer-<svg> doesn't use x/y, so we can pass eChildToUserSpace here. // Outer-<svg> doesn't use x/y, so we can pass eChildToUserSpace here.
gfxMatrix identity; gfxMatrix ownMatrix =
*aTransform = gfx::ToMatrix( content->PrependLocalTransformsTo(gfxMatrix(), eChildToUserSpace);
content->PrependLocalTransformsTo(identity, eChildToUserSpace));
if (ownMatrix.IsIdentity()) {
return false;
} }
return hasTransform; if (aOwnTransform) {
if (ownMatrix.HasNonTranslation()) {
// Note: viewBox, currentScale and currentTranslate should only
// produce a rectilinear transform.
// The nsDisplayTransform code will apply this transform to our frame,
// including to our frame position. We don't want our frame position to
// be scaled though, so we need to correct for that in the transform.
CSSPoint pos = CSSPixel::FromAppUnits(GetPosition());
CSSPoint scaledPos = CSSPoint(ownMatrix._11 * pos.x, ownMatrix._22 * pos.y);
CSSPoint deltaPos = scaledPos - pos;
ownMatrix *= gfxMatrix::Translation(-deltaPos.x, -deltaPos.y);
}
*aOwnTransform = gfx::ToMatrix(ownMatrix);
}
return true;
} }

5
layout/svg/nsSVGOuterSVGFrame.h
View file

@ -263,6 +263,9 @@ public:
*/ */
virtual nsIAtom* GetType() const override; virtual nsIAtom* GetType() const override;
bool IsSVGTransformed(Matrix *aOwnTransform,
Matrix *aFromParentTransform) const override;
// nsSVGContainerFrame methods: // nsSVGContainerFrame methods:
virtual gfxMatrix GetCanvasTM() override { virtual gfxMatrix GetCanvasTM() override {
// GetCanvasTM returns the transform from an SVG frame to the frame's // GetCanvasTM returns the transform from an SVG frame to the frame's
@ -270,8 +273,6 @@ public:
// set on us for any CSS border or padding on our nsSVGOuterSVGFrame. // set on us for any CSS border or padding on our nsSVGOuterSVGFrame.
return static_cast<nsSVGOuterSVGFrame*>(GetParent())->GetCanvasTM(); return static_cast<nsSVGOuterSVGFrame*>(GetParent())->GetCanvasTM();
} }
virtual bool HasChildrenOnlyTransform(Matrix *aTransform) const override;
}; };
#endif #endif