Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 10:00:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 599813 - nsSVGGlyphFrame::getCharacterData is expensive avoid calling it too many times. r+a=roc

Browse Source
This commit is contained in:
Robert Longson 2010-10-14 05:16:48 +01:00
parent 8e3b43d9b0
commit e018e5101d
4 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
layout/svg/base/src/nsISVGGlyphFragmentLeaf.h
View File

@ -70,18 +70,21 @@ public:
* Returns inherited x and y values instead of parent element's attribute
* values.
*/
NS_IMETHOD_(void) GetEffectiveXY(nsTArray<float> &aX, nsTArray<float> &aY)=0;
NS_IMETHOD_(void) GetEffectiveXY(PRInt32 strLength,
nsTArray<float> &aX, nsTArray<float> &aY)=0;
/*
* Returns inherited dx and dy values instead of parent element's attribute
* values.
*/
NS_IMETHOD_(void) GetEffectiveDxDy(nsTArray<float> &aDx,
NS_IMETHOD_(void) GetEffectiveDxDy(PRInt32 strLength,
nsTArray<float> &aDx,
nsTArray<float> &aDy)=0;
/*
* Returns inherited rotate values instead of parent element's attribute
* values.
*/
NS_IMETHOD_(void) GetEffectiveRotate(nsTArray<float> &aRotate)=0;
NS_IMETHOD_(void) GetEffectiveRotate(PRInt32 strLength,
nsTArray<float> &aRotate)=0;
NS_IMETHOD_(PRUint16) GetTextAnchor()=0;
NS_IMETHOD_(PRBool) IsAbsolutelyPositioned()=0;
};

23
layout/svg/base/src/nsSVGGlyphFrame.cpp
View File

@ -667,11 +667,11 @@ nsSVGGlyphFrame::GetCharacterPositions(nsTArray<CharacterPosition>* aCharacterPo
const gfxFloat radPerDeg = M_PI / 180.0;
nsTArray<float> xList, yList;
GetEffectiveXY(xList, yList);
GetEffectiveXY(strLength, xList, yList);
nsTArray<float> dxList, dyList;
GetEffectiveDxDy(dxList, dyList);
GetEffectiveDxDy(strLength, dxList, dyList);
nsTArray<float> rotateList;
GetEffectiveRotate(rotateList);
GetEffectiveRotate(strLength, rotateList);
gfxPoint pos = mPosition;
gfxFloat angle = 0.0;
@ -784,7 +784,7 @@ nsSVGGlyphFrame::GetSubStringAdvance(PRUint32 aCharnum,
mTextRun->GetAdvanceWidth(aCharnum, aFragmentChars, nsnull) * aMetricsScale;
nsTArray<float> dxlist, notUsed;
GetEffectiveDxDy(dxlist, notUsed);
GetEffectiveDxDy(mTextRun->GetLength(), dxlist, notUsed);
PRUint32 dxcount = dxlist.Length();
if (dxcount) {
gfxFloat pathScale = 1.0;
@ -1001,7 +1001,7 @@ nsSVGGlyphFrame::SetGlyphPosition(gfxPoint *aPosition, PRBool aForceGlobalTransf
PRUint32 strLength = mTextRun->GetLength();
nsTArray<float> xList, yList;
GetEffectiveXY(xList, yList);
GetEffectiveXY(strLength, xList, yList);
PRUint32 xCount = NS_MIN(xList.Length(), strLength);
PRUint32 yCount = NS_MIN(yList.Length(), strLength);
@ -1030,7 +1030,7 @@ nsSVGGlyphFrame::SetGlyphPosition(gfxPoint *aPosition, PRBool aForceGlobalTransf
pathScale = textPath->GetPathScale();
nsTArray<float> dxList, dyList;
GetEffectiveDxDy(dxList, dyList);
GetEffectiveDxDy(strLength, dxList, dyList);
PRUint32 dxcount = NS_MIN(dxList.Length(), strLength);
if (dxcount > 0) {
@ -1176,12 +1176,11 @@ nsSVGGlyphFrame::SetStartIndex(PRUint32 aStartIndex)
}
NS_IMETHODIMP_(void)
nsSVGGlyphFrame::GetEffectiveXY(nsTArray<float> &aX, nsTArray<float> &aY)
nsSVGGlyphFrame::GetEffectiveXY(PRInt32 strLength, nsTArray<float> &aX, nsTArray<float> &aY)
{
nsTArray<float> x, y;
static_cast<nsSVGTextContainerFrame *>(mParent)->GetEffectiveXY(x, y);
PRInt32 strLength = GetNumberOfChars();
PRInt32 xCount = NS_MAX((PRInt32)(x.Length() - mStartIndex), 0);
xCount = NS_MIN(xCount, strLength);
aX.AppendElements(x.Elements() + mStartIndex, xCount);
@ -1198,12 +1197,11 @@ nsSVGGlyphFrame::GetDxDy(SVGUserUnitList *aDx, SVGUserUnitList *aDy)
}
void
nsSVGGlyphFrame::GetEffectiveDxDy(nsTArray<float> &aDx, nsTArray<float> &aDy)
nsSVGGlyphFrame::GetEffectiveDxDy(PRInt32 strLength, nsTArray<float> &aDx, nsTArray<float> &aDy)
{
nsTArray<float> dx, dy;
static_cast<nsSVGTextContainerFrame *>(mParent)->GetEffectiveDxDy(dx, dy);
PRInt32 strLength = GetNumberOfChars();
PRInt32 dxCount = NS_MAX((PRInt32)(dx.Length() - mStartIndex), 0);
dxCount = NS_MIN(dxCount, strLength);
aDx.AppendElements(dx.Elements() + mStartIndex, dxCount);
@ -1224,12 +1222,11 @@ nsSVGGlyphFrame::GetRotate()
}
void
nsSVGGlyphFrame::GetEffectiveRotate(nsTArray<float> &aRotate)
nsSVGGlyphFrame::GetEffectiveRotate(PRInt32 strLength, nsTArray<float> &aRotate)
{
nsTArray<float> rotate;
static_cast<nsSVGTextContainerFrame *>(mParent)->GetEffectiveRotate(rotate);
PRInt32 strLength = GetNumberOfChars();
PRInt32 rotateCount = NS_MAX((PRInt32)(rotate.Length() - mStartIndex), 0);
rotateCount = NS_MIN(rotateCount, strLength);
if (rotateCount > 0) {
@ -1275,7 +1272,7 @@ nsSVGGlyphFrame::IsAbsolutelyPositioned()
// for each character within a 'text', 'tspan', 'tref' and 'altGlyph' element
// which has an x or y attribute value assigned to it explicitly
nsTArray<float> x, y;
GetEffectiveXY(x, y);
GetEffectiveXY(GetNumberOfChars(), x, y);
// Note: the y of descendants of textPath has no effect in horizontal writing
return (!x.IsEmpty() || (!hasTextPathAncestor && !y.IsEmpty()));
}

9
layout/svg/base/src/nsSVGGlyphFrame.h
View File

@ -152,10 +152,13 @@ public:
NS_IMETHOD_(void) GetXY(mozilla::SVGUserUnitList *aX, mozilla::SVGUserUnitList *aY);
NS_IMETHOD_(void) SetStartIndex(PRUint32 aStartIndex);
NS_IMETHOD_(void) GetEffectiveXY(nsTArray<float> &aX, nsTArray<float> &aY);
NS_IMETHOD_(void) GetEffectiveDxDy(nsTArray<float> &aDx,
NS_IMETHOD_(void) GetEffectiveXY(PRInt32 strLength,
nsTArray<float> &aX, nsTArray<float> &aY);
NS_IMETHOD_(void) GetEffectiveDxDy(PRInt32 strLength,
nsTArray<float> &aDx,
nsTArray<float> &aDy);
NS_IMETHOD_(void) GetEffectiveRotate(nsTArray<float> &aRotate);
NS_IMETHOD_(void) GetEffectiveRotate(PRInt32 strLength,
nsTArray<float> &aRotate);
NS_IMETHOD_(PRUint16) GetTextAnchor();
NS_IMETHOD_(PRBool) IsAbsolutelyPositioned();

3
layout/svg/base/src/nsSVGTextFrame.cpp
View File

@ -322,7 +322,8 @@ nsSVGTextFrame::UpdateGlyphPositioning(PRBool aForceGlobalTransform)
nsSVGTextPathFrame *textPath = firstFragment->FindTextPathParent();
nsTArray<float> effectiveXList, effectiveYList;
firstFragment->GetEffectiveXY(effectiveXList, effectiveYList);
firstFragment->GetEffectiveXY(firstFragment->GetNumberOfChars(),
effectiveXList, effectiveYList);
if (!effectiveXList.IsEmpty()) ctp.x = effectiveXList[0];
if (!textPath && !effectiveYList.IsEmpty()) ctp.y = effectiveYList[0];