Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 280554 - SVG content and layout should use GetAnimVal, not GetBaseVal.

Browse Source 
Patch by scootermorris@comcast.net, r=afri


git-svn-id: svn://10.0.0.236/trunk@168718 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
tor%cs.brown.edu
2005-02-02 20:31:51 +00:00
parent cfd52fa2ab
commit 96b2444f53
18 changed files with 83 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/content/svg/content/src/nsSVGCircleElement.cpp
View File

@@ -205,7 +205,7 @@ void nsSVGCircleElement::ParentChainChanged()
// cx:
{
nsCOMPtr<nsIDOMSVGLength> dom_length;
mCx->GetBaseVal(getter_AddRefs(dom_length));
mCx->GetAnimVal(getter_AddRefs(dom_length));
nsCOMPtr<nsISVGLength> length = do_QueryInterface(dom_length);
NS_ASSERTION(length, "svg length missing interface");
@@ -215,7 +215,7 @@ void nsSVGCircleElement::ParentChainChanged()
// cy:
{
nsCOMPtr<nsIDOMSVGLength> dom_length;
mCy->GetBaseVal(getter_AddRefs(dom_length));
mCy->GetAnimVal(getter_AddRefs(dom_length));
nsCOMPtr<nsISVGLength> length = do_QueryInterface(dom_length);
NS_ASSERTION(length, "svg length missing interface");
@@ -225,7 +225,7 @@ void nsSVGCircleElement::ParentChainChanged()
// r:
{
nsCOMPtr<nsIDOMSVGLength> dom_length;
mR->GetBaseVal(getter_AddRefs(dom_length));
mR->GetAnimVal(getter_AddRefs(dom_length));
nsCOMPtr<nsISVGLength> length = do_QueryInterface(dom_length);
NS_ASSERTION(length, "svg length missing interface");

8
mozilla/content/svg/content/src/nsSVGEllipseElement.cpp
View File

@@ -234,7 +234,7 @@ void nsSVGEllipseElement::ParentChainChanged()
// cx:
{
nsCOMPtr<nsIDOMSVGLength> dom_length;
mCx->GetBaseVal(getter_AddRefs(dom_length));
mCx->GetAnimVal(getter_AddRefs(dom_length));
nsCOMPtr<nsISVGLength> length = do_QueryInterface(dom_length);
NS_ASSERTION(length, "svg length missing interface");
@@ -244,7 +244,7 @@ void nsSVGEllipseElement::ParentChainChanged()
// cy:
{
nsCOMPtr<nsIDOMSVGLength> dom_length;
mCy->GetBaseVal(getter_AddRefs(dom_length));
mCy->GetAnimVal(getter_AddRefs(dom_length));
nsCOMPtr<nsISVGLength> length = do_QueryInterface(dom_length);
NS_ASSERTION(length, "svg length missing interface");
@@ -254,7 +254,7 @@ void nsSVGEllipseElement::ParentChainChanged()
// rx:
{
nsCOMPtr<nsIDOMSVGLength> dom_length;
mRx->GetBaseVal(getter_AddRefs(dom_length));
mRx->GetAnimVal(getter_AddRefs(dom_length));
nsCOMPtr<nsISVGLength> length = do_QueryInterface(dom_length);
NS_ASSERTION(length, "svg length missing interface");
@@ -264,7 +264,7 @@ void nsSVGEllipseElement::ParentChainChanged()
// rx:
{
nsCOMPtr<nsIDOMSVGLength> dom_length;
mRy->GetBaseVal(getter_AddRefs(dom_length));
mRy->GetAnimVal(getter_AddRefs(dom_length));
nsCOMPtr<nsISVGLength> length = do_QueryInterface(dom_length);
NS_ASSERTION(length, "svg length missing interface");

8
mozilla/content/svg/content/src/nsSVGForeignObjectElement.cpp
View File

@@ -232,7 +232,7 @@ void nsSVGForeignObjectElement::ParentChainChanged()
// x:
{
nsCOMPtr<nsIDOMSVGLength> dom_length;
mX->GetBaseVal(getter_AddRefs(dom_length));
mX->GetAnimVal(getter_AddRefs(dom_length));
nsCOMPtr<nsISVGLength> length = do_QueryInterface(dom_length);
NS_ASSERTION(length, "svg length missing interface");
@@ -242,7 +242,7 @@ void nsSVGForeignObjectElement::ParentChainChanged()
// y:
{
nsCOMPtr<nsIDOMSVGLength> dom_length;
mY->GetBaseVal(getter_AddRefs(dom_length));
mY->GetAnimVal(getter_AddRefs(dom_length));
nsCOMPtr<nsISVGLength> length = do_QueryInterface(dom_length);
NS_ASSERTION(length, "svg length missing interface");
@@ -252,7 +252,7 @@ void nsSVGForeignObjectElement::ParentChainChanged()
// width:
{
nsCOMPtr<nsIDOMSVGLength> dom_length;
mWidth->GetBaseVal(getter_AddRefs(dom_length));
mWidth->GetAnimVal(getter_AddRefs(dom_length));
nsCOMPtr<nsISVGLength> length = do_QueryInterface(dom_length);
NS_ASSERTION(length, "svg length missing interface");
@@ -262,7 +262,7 @@ void nsSVGForeignObjectElement::ParentChainChanged()
// height:
{
nsCOMPtr<nsIDOMSVGLength> dom_length;
mHeight->GetBaseVal(getter_AddRefs(dom_length));
mHeight->GetAnimVal(getter_AddRefs(dom_length));
nsCOMPtr<nsISVGLength> length = do_QueryInterface(dom_length);
NS_ASSERTION(length, "svg length missing interface");

8
mozilla/content/svg/content/src/nsSVGImageElement.cpp
View File

@@ -304,7 +304,7 @@ void nsSVGImageElement::ParentChainChanged()
// x:
{
nsCOMPtr<nsIDOMSVGLength> dom_length;
mX->GetBaseVal(getter_AddRefs(dom_length));
mX->GetAnimVal(getter_AddRefs(dom_length));
nsCOMPtr<nsISVGLength> length = do_QueryInterface(dom_length);
NS_ASSERTION(length, "svg length missing interface");
@@ -314,7 +314,7 @@ void nsSVGImageElement::ParentChainChanged()
// y:
{
nsCOMPtr<nsIDOMSVGLength> dom_length;
mY->GetBaseVal(getter_AddRefs(dom_length));
mY->GetAnimVal(getter_AddRefs(dom_length));
nsCOMPtr<nsISVGLength> length = do_QueryInterface(dom_length);
NS_ASSERTION(length, "svg length missing interface");
@@ -324,7 +324,7 @@ void nsSVGImageElement::ParentChainChanged()
// width:
{
nsCOMPtr<nsIDOMSVGLength> dom_length;
mWidth->GetBaseVal(getter_AddRefs(dom_length));
mWidth->GetAnimVal(getter_AddRefs(dom_length));
nsCOMPtr<nsISVGLength> length = do_QueryInterface(dom_length);
NS_ASSERTION(length, "svg length missing interface");
@@ -334,7 +334,7 @@ void nsSVGImageElement::ParentChainChanged()
// height:
{
nsCOMPtr<nsIDOMSVGLength> dom_length;
mHeight->GetBaseVal(getter_AddRefs(dom_length));
mHeight->GetAnimVal(getter_AddRefs(dom_length));
nsCOMPtr<nsISVGLength> length = do_QueryInterface(dom_length);
NS_ASSERTION(length, "svg length missing interface");

8
mozilla/content/svg/content/src/nsSVGLineElement.cpp
View File

@@ -234,7 +234,7 @@ void nsSVGLineElement::ParentChainChanged()
// x1:
{
nsCOMPtr<nsIDOMSVGLength> dom_length;
mX1->GetBaseVal(getter_AddRefs(dom_length));
mX1->GetAnimVal(getter_AddRefs(dom_length));
nsCOMPtr<nsISVGLength> length = do_QueryInterface(dom_length);
NS_ASSERTION(length, "svg length missing interface");
@@ -244,7 +244,7 @@ void nsSVGLineElement::ParentChainChanged()
// y1:
{
nsCOMPtr<nsIDOMSVGLength> dom_length;
mY1->GetBaseVal(getter_AddRefs(dom_length));
mY1->GetAnimVal(getter_AddRefs(dom_length));
nsCOMPtr<nsISVGLength> length = do_QueryInterface(dom_length);
NS_ASSERTION(length, "svg length missing interface");
@@ -254,7 +254,7 @@ void nsSVGLineElement::ParentChainChanged()
// x2:
{
nsCOMPtr<nsIDOMSVGLength> dom_length;
mX2->GetBaseVal(getter_AddRefs(dom_length));
mX2->GetAnimVal(getter_AddRefs(dom_length));
nsCOMPtr<nsISVGLength> length = do_QueryInterface(dom_length);
NS_ASSERTION(length, "svg length missing interface");
@@ -264,7 +264,7 @@ void nsSVGLineElement::ParentChainChanged()
// y2:
{
nsCOMPtr<nsIDOMSVGLength> dom_length;
mY2->GetBaseVal(getter_AddRefs(dom_length));
mY2->GetAnimVal(getter_AddRefs(dom_length));
nsCOMPtr<nsISVGLength> length = do_QueryInterface(dom_length);
NS_ASSERTION(length, "svg length missing interface");

12
mozilla/content/svg/content/src/nsSVGRectElement.cpp
View File

@@ -276,7 +276,7 @@ void nsSVGRectElement::ParentChainChanged()
// x:
{
nsCOMPtr<nsIDOMSVGLength> dom_length;
mX->GetBaseVal(getter_AddRefs(dom_length));
mX->GetAnimVal(getter_AddRefs(dom_length));
nsCOMPtr<nsISVGLength> length = do_QueryInterface(dom_length);
NS_ASSERTION(length, "svg length missing interface");
@@ -286,7 +286,7 @@ void nsSVGRectElement::ParentChainChanged()
// y:
{
nsCOMPtr<nsIDOMSVGLength> dom_length;
mY->GetBaseVal(getter_AddRefs(dom_length));
mY->GetAnimVal(getter_AddRefs(dom_length));
nsCOMPtr<nsISVGLength> length = do_QueryInterface(dom_length);
NS_ASSERTION(length, "svg length missing interface");
@@ -296,7 +296,7 @@ void nsSVGRectElement::ParentChainChanged()
// width:
{
nsCOMPtr<nsIDOMSVGLength> dom_length;
mWidth->GetBaseVal(getter_AddRefs(dom_length));
mWidth->GetAnimVal(getter_AddRefs(dom_length));
nsCOMPtr<nsISVGLength> length = do_QueryInterface(dom_length);
NS_ASSERTION(length, "svg length missing interface");
@@ -306,7 +306,7 @@ void nsSVGRectElement::ParentChainChanged()
// height:
{
nsCOMPtr<nsIDOMSVGLength> dom_length;
mHeight->GetBaseVal(getter_AddRefs(dom_length));
mHeight->GetAnimVal(getter_AddRefs(dom_length));
nsCOMPtr<nsISVGLength> length = do_QueryInterface(dom_length);
NS_ASSERTION(length, "svg length missing interface");
@@ -316,7 +316,7 @@ void nsSVGRectElement::ParentChainChanged()
// rx:
{
nsCOMPtr<nsIDOMSVGLength> dom_length;
mRx->GetBaseVal(getter_AddRefs(dom_length));
mRx->GetAnimVal(getter_AddRefs(dom_length));
nsCOMPtr<nsISVGLength> length = do_QueryInterface(dom_length);
NS_ASSERTION(length, "svg length missing interface");
@@ -326,7 +326,7 @@ void nsSVGRectElement::ParentChainChanged()
// ry:
{
nsCOMPtr<nsIDOMSVGLength> dom_length;
mRy->GetBaseVal(getter_AddRefs(dom_length));
mRy->GetAnimVal(getter_AddRefs(dom_length));
nsCOMPtr<nsISVGLength> length = do_QueryInterface(dom_length);
NS_ASSERTION(length, "svg length missing interface");

8
mozilla/content/svg/content/src/nsSVGSVGElement.cpp
View File

@@ -1163,28 +1163,28 @@ nsSVGSVGElement::SetParentCoordCtxProvider(nsSVGCoordCtxProvider *parentCtx)
// set the parentCtx as context on our width/height/x/y:
{
nsCOMPtr<nsIDOMSVGLength> dom_length;
mX->GetBaseVal(getter_AddRefs(dom_length));
mX->GetAnimVal(getter_AddRefs(dom_length));
nsCOMPtr<nsISVGLength> l = do_QueryInterface(dom_length);
l->SetContext(nsRefPtr<nsSVGCoordCtx>(parentCtx->GetContextX()));
}
{
nsCOMPtr<nsIDOMSVGLength> dom_length;
mY->GetBaseVal(getter_AddRefs(dom_length));
mY->GetAnimVal(getter_AddRefs(dom_length));
nsCOMPtr<nsISVGLength> l = do_QueryInterface(dom_length);
l->SetContext(nsRefPtr<nsSVGCoordCtx>(parentCtx->GetContextY()));
}
{
nsCOMPtr<nsIDOMSVGLength> dom_length;
mWidth->GetBaseVal(getter_AddRefs(dom_length));
mWidth->GetAnimVal(getter_AddRefs(dom_length));
nsCOMPtr<nsISVGLength> l = do_QueryInterface(dom_length);
l->SetContext(nsRefPtr<nsSVGCoordCtx>(parentCtx->GetContextX()));
}
{
nsCOMPtr<nsIDOMSVGLength> dom_length;
mHeight->GetBaseVal(getter_AddRefs(dom_length));
mHeight->GetAnimVal(getter_AddRefs(dom_length));
nsCOMPtr<nsISVGLength> l = do_QueryInterface(dom_length);
l->SetContext(nsRefPtr<nsSVGCoordCtx>(parentCtx->GetContextY()));
}

4
mozilla/content/svg/content/src/nsSVGTSpanElement.cpp
View File

@@ -322,7 +322,7 @@ void nsSVGTSpanElement::ParentChainChanged()
// x:
{
nsCOMPtr<nsIDOMSVGLengthList> dom_lengthlist;
mX->GetBaseVal(getter_AddRefs(dom_lengthlist));
mX->GetAnimVal(getter_AddRefs(dom_lengthlist));
nsCOMPtr<nsISVGLengthList> lengthlist = do_QueryInterface(dom_lengthlist);
NS_ASSERTION(lengthlist, "svg lengthlist missing interface");
@@ -332,7 +332,7 @@ void nsSVGTSpanElement::ParentChainChanged()
// y:
{
nsCOMPtr<nsIDOMSVGLengthList> dom_lengthlist;
mY->GetBaseVal(getter_AddRefs(dom_lengthlist));
mY->GetAnimVal(getter_AddRefs(dom_lengthlist));
nsCOMPtr<nsISVGLengthList> lengthlist = do_QueryInterface(dom_lengthlist);
NS_ASSERTION(lengthlist, "svg lengthlist missing interface");

4
mozilla/content/svg/content/src/nsSVGTextElement.cpp
View File

@@ -338,7 +338,7 @@ void nsSVGTextElement::ParentChainChanged()
// x:
{
nsCOMPtr<nsIDOMSVGLengthList> dom_lengthlist;
mX->GetBaseVal(getter_AddRefs(dom_lengthlist));
mX->GetAnimVal(getter_AddRefs(dom_lengthlist));
nsCOMPtr<nsISVGLengthList> lengthlist = do_QueryInterface(dom_lengthlist);
NS_ASSERTION(lengthlist, "svg lengthlist missing interface");
@@ -348,7 +348,7 @@ void nsSVGTextElement::ParentChainChanged()
// y:
{
nsCOMPtr<nsIDOMSVGLengthList> dom_lengthlist;
mY->GetBaseVal(getter_AddRefs(dom_lengthlist));
mY->GetAnimVal(getter_AddRefs(dom_lengthlist));
nsCOMPtr<nsISVGLengthList> lengthlist = do_QueryInterface(dom_lengthlist);
NS_ASSERTION(lengthlist, "svg lengthlist missing interface");

12
mozilla/content/svg/content/src/nsSVGUseElement.cpp
View File

@@ -251,7 +251,7 @@ void nsSVGUseElement::ParentChainChanged()
// x:
{
nsCOMPtr<nsIDOMSVGLength> dom_length;
mX->GetBaseVal(getter_AddRefs(dom_length));
mX->GetAnimVal(getter_AddRefs(dom_length));
nsCOMPtr<nsISVGLength> length = do_QueryInterface(dom_length);
NS_ASSERTION(length, "svg length missing interface");
@@ -261,7 +261,7 @@ void nsSVGUseElement::ParentChainChanged()
// y:
{
nsCOMPtr<nsIDOMSVGLength> dom_length;
mY->GetBaseVal(getter_AddRefs(dom_length));
mY->GetAnimVal(getter_AddRefs(dom_length));
nsCOMPtr<nsISVGLength> length = do_QueryInterface(dom_length);
NS_ASSERTION(length, "svg length missing interface");
@@ -271,7 +271,7 @@ void nsSVGUseElement::ParentChainChanged()
// width:
{
nsCOMPtr<nsIDOMSVGLength> dom_length;
mWidth->GetBaseVal(getter_AddRefs(dom_length));
mWidth->GetAnimVal(getter_AddRefs(dom_length));
nsCOMPtr<nsISVGLength> length = do_QueryInterface(dom_length);
NS_ASSERTION(length, "svg length missing interface");
@@ -281,7 +281,7 @@ void nsSVGUseElement::ParentChainChanged()
// height:
{
nsCOMPtr<nsIDOMSVGLength> dom_length;
mHeight->GetBaseVal(getter_AddRefs(dom_length));
mHeight->GetAnimVal(getter_AddRefs(dom_length));
nsCOMPtr<nsISVGLength> length = do_QueryInterface(dom_length);
NS_ASSERTION(length, "svg length missing interface");
@@ -465,7 +465,7 @@ nsSVGUseElement::CreateAnonymousContent(nsPresContext* aPresContext,
{
#ifdef DEBUG_tor
nsAutoString href;
mHref->GetBaseVal(href);
mHref->GetAnimVal(href);
fprintf(stderr, "<svg:use> reclone of \"%s\"\n", ToNewCString(href));
#endif
@@ -603,7 +603,7 @@ nsSVGUseElement::LookupHref(nsIDOMSVGElement **aResult)
nsresult rv;
nsAutoString href;
mHref->GetBaseVal(href);
mHref->GetAnimVal(href);
if (href.IsEmpty())
return NS_OK;

6
mozilla/layout/svg/base/src/nsSVGCircleFrame.cpp
View File

@@ -116,7 +116,7 @@ nsresult nsSVGCircleFrame::Init()
{
nsCOMPtr<nsIDOMSVGAnimatedLength> length;
circle->GetCx(getter_AddRefs(length));
length->GetBaseVal(getter_AddRefs(mCx));
length->GetAnimVal(getter_AddRefs(mCx));
NS_ASSERTION(mCx, "no cx");
if (!mCx) return NS_ERROR_FAILURE;
nsCOMPtr<nsISVGValue> value = do_QueryInterface(mCx);
@@ -127,7 +127,7 @@ nsresult nsSVGCircleFrame::Init()
{
nsCOMPtr<nsIDOMSVGAnimatedLength> length;
circle->GetCy(getter_AddRefs(length));
length->GetBaseVal(getter_AddRefs(mCy));
length->GetAnimVal(getter_AddRefs(mCy));
NS_ASSERTION(mCx, "no cy");
if (!mCx) return NS_ERROR_FAILURE;
nsCOMPtr<nsISVGValue> value = do_QueryInterface(mCy);
@@ -138,7 +138,7 @@ nsresult nsSVGCircleFrame::Init()
{
nsCOMPtr<nsIDOMSVGAnimatedLength> length;
circle->GetR(getter_AddRefs(length));
length->GetBaseVal(getter_AddRefs(mR));
length->GetAnimVal(getter_AddRefs(mR));
NS_ASSERTION(mCx, "no r");
if (!mCx) return NS_ERROR_FAILURE;
nsCOMPtr<nsISVGValue> value = do_QueryInterface(mR);

2
mozilla/layout/svg/base/src/nsSVGClipPathFrame.cpp
View File

@@ -259,7 +259,7 @@ nsSVGClipPathFrame::GetCanvasTM()
nsCOMPtr<nsIDOMSVGClipPathElement> path = do_QueryInterface(mContent);
nsCOMPtr<nsIDOMSVGAnimatedEnumeration> aEnum;
path->GetClipPathUnits(getter_AddRefs(aEnum));
aEnum->GetBaseVal(&units);
aEnum->GetAnimVal(&units);
if (mClipParent &&
units == nsIDOMSVGClipPathElement::SVG_CPUNITS_OBJECTBOUNDINGBOX) {

8
mozilla/layout/svg/base/src/nsSVGEllipseFrame.cpp
View File

@@ -116,7 +116,7 @@ nsresult nsSVGEllipseFrame::Init()
{
nsCOMPtr<nsIDOMSVGAnimatedLength> length;
ellipse->GetCx(getter_AddRefs(length));
length->GetBaseVal(getter_AddRefs(mCx));
length->GetAnimVal(getter_AddRefs(mCx));
NS_ASSERTION(mCx, "no cx");
if (!mCx) return NS_ERROR_FAILURE;
nsCOMPtr<nsISVGValue> value = do_QueryInterface(mCx);
@@ -127,7 +127,7 @@ nsresult nsSVGEllipseFrame::Init()
{
nsCOMPtr<nsIDOMSVGAnimatedLength> length;
ellipse->GetCy(getter_AddRefs(length));
length->GetBaseVal(getter_AddRefs(mCy));
length->GetAnimVal(getter_AddRefs(mCy));
NS_ASSERTION(mCy, "no cy");
if (!mCy) return NS_ERROR_FAILURE;
nsCOMPtr<nsISVGValue> value = do_QueryInterface(mCy);
@@ -138,7 +138,7 @@ nsresult nsSVGEllipseFrame::Init()
{
nsCOMPtr<nsIDOMSVGAnimatedLength> length;
ellipse->GetRx(getter_AddRefs(length));
length->GetBaseVal(getter_AddRefs(mRx));
length->GetAnimVal(getter_AddRefs(mRx));
NS_ASSERTION(mRx, "no rx");
if (!mRx) return NS_ERROR_FAILURE;
nsCOMPtr<nsISVGValue> value = do_QueryInterface(mRx);
@@ -149,7 +149,7 @@ nsresult nsSVGEllipseFrame::Init()
{
nsCOMPtr<nsIDOMSVGAnimatedLength> length;
ellipse->GetRy(getter_AddRefs(length));
length->GetBaseVal(getter_AddRefs(mRy));
length->GetAnimVal(getter_AddRefs(mRy));
NS_ASSERTION(mRy, "no ry");
if (!mRy) return NS_ERROR_FAILURE;
nsCOMPtr<nsISVGValue> value = do_QueryInterface(mRy);

30
mozilla/layout/svg/base/src/nsSVGGradientFrame.cpp
View File

@@ -165,7 +165,7 @@ nsSVGGradientFrame::GetStopOffset(PRInt32 aIndex, float *aOffset)
}
nsCOMPtr<nsIDOMSVGAnimatedNumber> aNum;
stopElement->GetOffset(getter_AddRefs(aNum));
aNum->GetBaseVal(aOffset);
aNum->GetAnimVal(aOffset);
if (*aOffset < 0.0f)
*aOffset = 0.0f;
if (*aOffset > 1.0f)
@@ -293,7 +293,7 @@ nsSVGGradientFrame::GetGradientUnits(PRUint16 *aUnits)
if (!checkURITarget(nsSVGAtoms::gradientUnits)) {
// No, return the values
aGrad->GetGradientUnits(getter_AddRefs(aEnum));
aEnum->GetBaseVal(aUnits);
aEnum->GetAnimVal(aUnits);
} else {
// Yes, get it from the target
mNextGrad->GetGradientUnits(aUnits);
@@ -315,7 +315,7 @@ nsSVGGradientFrame::GetGradientTransform(nsIDOMSVGMatrix **aGradientTransform)
// No, return the values
aGrad->GetGradientTransform(getter_AddRefs(aTrans));
nsCOMPtr<nsIDOMSVGTransformList> lTrans;
aTrans->GetBaseVal(getter_AddRefs(lTrans));
aTrans->GetAnimVal(getter_AddRefs(lTrans));
lTrans->GetConsolidationMatrix(aGradientTransform);
} else {
// Yes, get it from the target
@@ -337,7 +337,7 @@ nsSVGGradientFrame::GetSpreadMethod(PRUint16 *aSpreadMethod)
if (!checkURITarget(nsSVGAtoms::spreadMethod)) {
// No, return the values
aGrad->GetSpreadMethod(getter_AddRefs(aEnum));
aEnum->GetBaseVal(aSpreadMethod);
aEnum->GetAnimVal(aSpreadMethod);
} else {
// Yes, get it from the target
mNextGrad->GetSpreadMethod(aSpreadMethod);
@@ -451,7 +451,7 @@ nsSVGLinearGradientFrame::GetX1(float *aX1)
nsCOMPtr<nsIDOMSVGAnimatedLength> aLen;
aLgrad->GetX1(getter_AddRefs(aLen));
nsCOMPtr<nsIDOMSVGLength> sLen;
aLen->GetBaseVal(getter_AddRefs(sLen));
aLen->GetAnimVal(getter_AddRefs(sLen));
sLen->GetValue(aX1);
return NS_OK;
}
@@ -480,7 +480,7 @@ nsSVGLinearGradientFrame::GetY1(float *aY1)
nsCOMPtr<nsIDOMSVGAnimatedLength> aLen;
aLgrad->GetY1(getter_AddRefs(aLen));
nsCOMPtr<nsIDOMSVGLength> sLen;
aLen->GetBaseVal(getter_AddRefs(sLen));
aLen->GetAnimVal(getter_AddRefs(sLen));
sLen->GetValue(aY1);
return NS_OK;
}
@@ -509,7 +509,7 @@ nsSVGLinearGradientFrame::GetX2(float *aX2)
nsCOMPtr<nsIDOMSVGAnimatedLength> aLen;
aLgrad->GetX2(getter_AddRefs(aLen));
nsCOMPtr<nsIDOMSVGLength> sLen;
aLen->GetBaseVal(getter_AddRefs(sLen));
aLen->GetAnimVal(getter_AddRefs(sLen));
sLen->GetValue(aX2);
return NS_OK;
}
@@ -538,7 +538,7 @@ nsSVGLinearGradientFrame::GetY2(float *aY2)
nsCOMPtr<nsIDOMSVGAnimatedLength> aLen;
aLgrad->GetY2(getter_AddRefs(aLen));
nsCOMPtr<nsIDOMSVGLength> sLen;
aLen->GetBaseVal(getter_AddRefs(sLen));
aLen->GetAnimVal(getter_AddRefs(sLen));
sLen->GetValue(aY2);
return NS_OK;
}
@@ -597,7 +597,7 @@ nsSVGRadialGradientFrame::GetCx(float *aCx)
nsCOMPtr<nsIDOMSVGAnimatedLength> aLen;
aRgrad->GetCx(getter_AddRefs(aLen));
nsCOMPtr<nsIDOMSVGLength> sLen;
aLen->GetBaseVal(getter_AddRefs(sLen));
aLen->GetAnimVal(getter_AddRefs(sLen));
sLen->GetValue(aCx);
return NS_OK;
}
@@ -626,7 +626,7 @@ nsSVGRadialGradientFrame::GetCy(float *aCy)
nsCOMPtr<nsIDOMSVGAnimatedLength> aLen;
aRgrad->GetCy(getter_AddRefs(aLen));
nsCOMPtr<nsIDOMSVGLength> sLen;
aLen->GetBaseVal(getter_AddRefs(sLen));
aLen->GetAnimVal(getter_AddRefs(sLen));
sLen->GetValue(aCy);
return NS_OK;
}
@@ -655,7 +655,7 @@ nsSVGRadialGradientFrame::GetR(float *aR)
nsCOMPtr<nsIDOMSVGAnimatedLength> aLen;
aRgrad->GetR(getter_AddRefs(aLen));
nsCOMPtr<nsIDOMSVGLength> sLen;
aLen->GetBaseVal(getter_AddRefs(sLen));
aLen->GetAnimVal(getter_AddRefs(sLen));
sLen->GetValue(aR);
return NS_OK;
}
@@ -686,7 +686,7 @@ nsSVGRadialGradientFrame::GetFx(float *aFx)
nsCOMPtr<nsIDOMSVGAnimatedLength> aLen;
aRgrad->GetFx(getter_AddRefs(aLen));
nsCOMPtr<nsIDOMSVGLength> sLen;
aLen->GetBaseVal(getter_AddRefs(sLen));
aLen->GetAnimVal(getter_AddRefs(sLen));
sLen->GetValue(aFx);
return NS_OK;
}
@@ -717,7 +717,7 @@ nsSVGRadialGradientFrame::GetFy(float *aFy)
nsCOMPtr<nsIDOMSVGAnimatedLength> aLen;
aRgrad->GetFy(getter_AddRefs(aLen));
nsCOMPtr<nsIDOMSVGLength> sLen;
aLen->GetBaseVal(getter_AddRefs(sLen));
aLen->GetAnimVal(getter_AddRefs(sLen));
sLen->GetValue(aFy);
return NS_OK;
}
@@ -755,7 +755,7 @@ nsresult NS_NewSVGLinearGradientFrame(nsIPresShell* aPresShell,
aRef->GetHref(getter_AddRefs(aHref));
// We *really* want an observer on this
nsAutoString aStr;
aHref->GetBaseVal(aStr);
aHref->GetAnimVal(aStr);
it->mNextGradStr = aStr;
it->mNextGrad = nsnull;
}
@@ -793,7 +793,7 @@ nsresult NS_NewSVGRadialGradientFrame(nsIPresShell* aPresShell,
aRef->GetHref(getter_AddRefs(aHref));
// We *really* want an observer on this
nsAutoString aStr;
aHref->GetBaseVal(aStr);
aHref->GetAnimVal(aStr);
it->mNextGradStr = aStr;
it->mNextGrad = nsnull;
}

10
mozilla/layout/svg/base/src/nsSVGImageFrame.cpp
View File

@@ -171,7 +171,7 @@ nsresult nsSVGImageFrame::Init()
{
nsCOMPtr<nsIDOMSVGAnimatedLength> length;
Rect->GetX(getter_AddRefs(length));
length->GetBaseVal(getter_AddRefs(mX));
length->GetAnimVal(getter_AddRefs(mX));
NS_ASSERTION(mX, "no x");
if (!mX) return NS_ERROR_FAILURE;
nsCOMPtr<nsISVGValue> value = do_QueryInterface(mX);
@@ -182,7 +182,7 @@ nsresult nsSVGImageFrame::Init()
{
nsCOMPtr<nsIDOMSVGAnimatedLength> length;
Rect->GetY(getter_AddRefs(length));
length->GetBaseVal(getter_AddRefs(mY));
length->GetAnimVal(getter_AddRefs(mY));
NS_ASSERTION(mY, "no y");
if (!mY) return NS_ERROR_FAILURE;
nsCOMPtr<nsISVGValue> value = do_QueryInterface(mY);
@@ -193,7 +193,7 @@ nsresult nsSVGImageFrame::Init()
{
nsCOMPtr<nsIDOMSVGAnimatedLength> length;
Rect->GetWidth(getter_AddRefs(length));
length->GetBaseVal(getter_AddRefs(mWidth));
length->GetAnimVal(getter_AddRefs(mWidth));
NS_ASSERTION(mWidth, "no width");
if (!mWidth) return NS_ERROR_FAILURE;
nsCOMPtr<nsISVGValue> value = do_QueryInterface(mWidth);
@@ -204,7 +204,7 @@ nsresult nsSVGImageFrame::Init()
{
nsCOMPtr<nsIDOMSVGAnimatedLength> length;
Rect->GetHeight(getter_AddRefs(length));
length->GetBaseVal(getter_AddRefs(mHeight));
length->GetAnimVal(getter_AddRefs(mHeight));
NS_ASSERTION(mHeight, "no height");
if (!mHeight) return NS_ERROR_FAILURE;
nsCOMPtr<nsISVGValue> value = do_QueryInterface(mHeight);
@@ -215,7 +215,7 @@ nsresult nsSVGImageFrame::Init()
{
nsCOMPtr<nsIDOMSVGAnimatedPreserveAspectRatio> ratio;
Rect->GetPreserveAspectRatio(getter_AddRefs(ratio));
ratio->GetBaseVal(getter_AddRefs(mPreserveAspectRatio));
ratio->GetAnimVal(getter_AddRefs(mPreserveAspectRatio));
NS_ASSERTION(mHeight, "no preserveAspectRatio");
if (!mPreserveAspectRatio) return NS_ERROR_FAILURE;
nsCOMPtr<nsISVGValue> value = do_QueryInterface(mPreserveAspectRatio);

8
mozilla/layout/svg/base/src/nsSVGLineFrame.cpp
View File

@@ -133,7 +133,7 @@ nsresult nsSVGLineFrame::Init()
{
nsCOMPtr<nsIDOMSVGAnimatedLength> length;
line->GetX1(getter_AddRefs(length));
length->GetBaseVal(getter_AddRefs(mX1));
length->GetAnimVal(getter_AddRefs(mX1));
NS_ASSERTION(mX1, "no x1");
if (!mX1) return NS_ERROR_FAILURE;
nsCOMPtr<nsISVGValue> value = do_QueryInterface(mX1);
@@ -144,7 +144,7 @@ nsresult nsSVGLineFrame::Init()
{
nsCOMPtr<nsIDOMSVGAnimatedLength> length;
line->GetY1(getter_AddRefs(length));
length->GetBaseVal(getter_AddRefs(mY1));
length->GetAnimVal(getter_AddRefs(mY1));
NS_ASSERTION(mY1, "no y1");
if (!mY1) return NS_ERROR_FAILURE;
nsCOMPtr<nsISVGValue> value = do_QueryInterface(mY1);
@@ -155,7 +155,7 @@ nsresult nsSVGLineFrame::Init()
{
nsCOMPtr<nsIDOMSVGAnimatedLength> length;
line->GetX2(getter_AddRefs(length));
length->GetBaseVal(getter_AddRefs(mX2));
length->GetAnimVal(getter_AddRefs(mX2));
NS_ASSERTION(mX2, "no x2");
if (!mX2) return NS_ERROR_FAILURE;
nsCOMPtr<nsISVGValue> value = do_QueryInterface(mX2);
@@ -166,7 +166,7 @@ nsresult nsSVGLineFrame::Init()
{
nsCOMPtr<nsIDOMSVGAnimatedLength> length;
line->GetY2(getter_AddRefs(length));
length->GetBaseVal(getter_AddRefs(mY2));
length->GetAnimVal(getter_AddRefs(mY2));
NS_ASSERTION(mY2, "no y2");
if (!mY2) return NS_ERROR_FAILURE;
nsCOMPtr<nsISVGValue> value = do_QueryInterface(mY2);

12
mozilla/layout/svg/base/src/nsSVGMarkerFrame.cpp
View File

@@ -175,7 +175,7 @@ nsresult nsSVGMarkerFrame::Init()
{
nsCOMPtr<nsIDOMSVGAnimatedLength> length;
marker->GetRefX(getter_AddRefs(length));
length->GetBaseVal(getter_AddRefs(mRefX));
length->GetAnimVal(getter_AddRefs(mRefX));
NS_ASSERTION(mRefX, "no RefX");
if (!mRefX) return NS_ERROR_FAILURE;
nsCOMPtr<nsISVGValue> value = do_QueryInterface(mRefX);
@@ -186,7 +186,7 @@ nsresult nsSVGMarkerFrame::Init()
{
nsCOMPtr<nsIDOMSVGAnimatedLength> length;
marker->GetRefY(getter_AddRefs(length));
length->GetBaseVal(getter_AddRefs(mRefY));
length->GetAnimVal(getter_AddRefs(mRefY));
NS_ASSERTION(mRefY, "no RefY");
if (!mRefY) return NS_ERROR_FAILURE;
nsCOMPtr<nsISVGValue> value = do_QueryInterface(mRefY);
@@ -197,7 +197,7 @@ nsresult nsSVGMarkerFrame::Init()
{
nsCOMPtr<nsIDOMSVGAnimatedLength> length;
marker->GetMarkerWidth(getter_AddRefs(length));
length->GetBaseVal(getter_AddRefs(mMarkerWidth));
length->GetAnimVal(getter_AddRefs(mMarkerWidth));
NS_ASSERTION(mMarkerWidth, "no markerWidth");
if (!mMarkerWidth) return NS_ERROR_FAILURE;
nsCOMPtr<nsISVGValue> value = do_QueryInterface(mMarkerWidth);
@@ -208,7 +208,7 @@ nsresult nsSVGMarkerFrame::Init()
{
nsCOMPtr<nsIDOMSVGAnimatedLength> length;
marker->GetMarkerHeight(getter_AddRefs(length));
length->GetBaseVal(getter_AddRefs(mMarkerHeight));
length->GetAnimVal(getter_AddRefs(mMarkerHeight));
NS_ASSERTION(mMarkerHeight, "no markerHeight");
if (!mMarkerHeight) return NS_ERROR_FAILURE;
nsCOMPtr<nsISVGValue> value = do_QueryInterface(mMarkerHeight);
@@ -219,7 +219,7 @@ nsresult nsSVGMarkerFrame::Init()
{
nsCOMPtr<nsIDOMSVGAnimatedAngle> angle;
marker->GetOrientAngle(getter_AddRefs(angle));
angle->GetBaseVal(getter_AddRefs(mOrientAngle));
angle->GetAnimVal(getter_AddRefs(mOrientAngle));
NS_ASSERTION(mOrientAngle, "no orientAngle");
if (!mOrientAngle) return NS_ERROR_FAILURE;
nsCOMPtr<nsISVGValue> value = do_QueryInterface(mOrientAngle);
@@ -233,7 +233,7 @@ nsresult nsSVGMarkerFrame::Init()
box->GetViewBox(getter_AddRefs(rect));
if (rect) {
rect->GetBaseVal(getter_AddRefs(mViewBox));
rect->GetAnimVal(getter_AddRefs(mViewBox));
NS_ASSERTION(mRefY, "no viewBox");
if (!mRefY) return NS_ERROR_FAILURE;
nsCOMPtr<nsISVGValue> value = do_QueryInterface(mRefY);

12
mozilla/layout/svg/base/src/nsSVGRectFrame.cpp
View File

@@ -125,7 +125,7 @@ nsresult nsSVGRectFrame::Init()
{
nsCOMPtr<nsIDOMSVGAnimatedLength> length;
Rect->GetX(getter_AddRefs(length));
length->GetBaseVal(getter_AddRefs(mX));
length->GetAnimVal(getter_AddRefs(mX));
NS_ASSERTION(mX, "no x");
if (!mX)
return NS_ERROR_FAILURE;
@@ -137,7 +137,7 @@ nsresult nsSVGRectFrame::Init()
{
nsCOMPtr<nsIDOMSVGAnimatedLength> length;
Rect->GetY(getter_AddRefs(length));
length->GetBaseVal(getter_AddRefs(mY));
length->GetAnimVal(getter_AddRefs(mY));
NS_ASSERTION(mY, "no y");
if (!mY)
return NS_ERROR_FAILURE;
@@ -149,7 +149,7 @@ nsresult nsSVGRectFrame::Init()
{
nsCOMPtr<nsIDOMSVGAnimatedLength> length;
Rect->GetWidth(getter_AddRefs(length));
length->GetBaseVal(getter_AddRefs(mWidth));
length->GetAnimVal(getter_AddRefs(mWidth));
NS_ASSERTION(mWidth, "no width");
if (!mWidth)
return NS_ERROR_FAILURE;
@@ -160,7 +160,7 @@ nsresult nsSVGRectFrame::Init()
{
nsCOMPtr<nsIDOMSVGAnimatedLength> length;
Rect->GetHeight(getter_AddRefs(length));
length->GetBaseVal(getter_AddRefs(mHeight));
length->GetAnimVal(getter_AddRefs(mHeight));
NS_ASSERTION(mHeight, "no height");
if (!mHeight)
return NS_ERROR_FAILURE;
@@ -172,7 +172,7 @@ nsresult nsSVGRectFrame::Init()
{
nsCOMPtr<nsIDOMSVGAnimatedLength> length;
Rect->GetRx(getter_AddRefs(length));
length->GetBaseVal(getter_AddRefs(mRx));
length->GetAnimVal(getter_AddRefs(mRx));
NS_ASSERTION(mRx, "no rx");
if (!mRx)
return NS_ERROR_FAILURE;
@@ -184,7 +184,7 @@ nsresult nsSVGRectFrame::Init()
{
nsCOMPtr<nsIDOMSVGAnimatedLength> length;
Rect->GetRy(getter_AddRefs(length));
length->GetBaseVal(getter_AddRefs(mRy));
length->GetAnimVal(getter_AddRefs(mRy));
NS_ASSERTION(mRy, "no ry");
if (!mRy)
return NS_ERROR_FAILURE;