diff --git a/mozilla/content/svg/content/src/nsSVGLengthList.cpp b/mozilla/content/svg/content/src/nsSVGLengthList.cpp index 0159d1d3056..5f06cc4b3f0 100644 --- a/mozilla/content/svg/content/src/nsSVGLengthList.cpp +++ b/mozilla/content/svg/content/src/nsSVGLengthList.cpp @@ -57,9 +57,10 @@ class nsSVGLengthList : public nsIDOMSVGLengthList, { protected: friend nsresult NS_NewSVGLengthList(nsIDOMSVGLengthList** result, - nsSVGElement *aContext); + nsSVGElement *aContext, + PRUint8 aCtxType); - nsSVGLengthList(nsSVGElement *aContext); + nsSVGLengthList(nsSVGElement *aContext, PRUint8 aCtxType); ~nsSVGLengthList(); // void Init(); @@ -101,8 +102,8 @@ protected: //---------------------------------------------------------------------- // Implementation -nsSVGLengthList::nsSVGLengthList(nsSVGElement *aContext) - : mCtxType(0) +nsSVGLengthList::nsSVGLengthList(nsSVGElement *aContext, PRUint8 aCtxType) + : mCtxType(aCtxType) { mContext = do_GetWeakReference(NS_STATIC_CAST(nsGenericElement*, aContext)); } @@ -389,11 +390,11 @@ nsSVGLengthList::InsertElementAt(nsISVGLength* aElement, PRInt32 index) // Exported creation functions: nsresult -NS_NewSVGLengthList(nsIDOMSVGLengthList** result, nsSVGElement *aContext) +NS_NewSVGLengthList(nsIDOMSVGLengthList** result, nsSVGElement *aContext, PRUint8 aCtxType) { *result = nsnull; - nsSVGLengthList* lengthList = new nsSVGLengthList(aContext); + nsSVGLengthList* lengthList = new nsSVGLengthList(aContext, aCtxType); if (!lengthList) return NS_ERROR_OUT_OF_MEMORY; NS_ADDREF(lengthList); diff --git a/mozilla/content/svg/content/src/nsSVGLengthList.h b/mozilla/content/svg/content/src/nsSVGLengthList.h index e2d1c13a9cf..4ef5673fa5c 100644 --- a/mozilla/content/svg/content/src/nsSVGLengthList.h +++ b/mozilla/content/svg/content/src/nsSVGLengthList.h @@ -44,6 +44,6 @@ class nsSVGElement; nsresult -NS_NewSVGLengthList(nsIDOMSVGLengthList** result, nsSVGElement *aContext); +NS_NewSVGLengthList(nsIDOMSVGLengthList** result, nsSVGElement *aContext, PRUint8 aCtxType); #endif //__NS_SVGLENGTHLIST_H__ diff --git a/mozilla/content/svg/content/src/nsSVGTSpanElement.cpp b/mozilla/content/svg/content/src/nsSVGTSpanElement.cpp index e93fb4137eb..bf61f251686 100644 --- a/mozilla/content/svg/content/src/nsSVGTSpanElement.cpp +++ b/mozilla/content/svg/content/src/nsSVGTSpanElement.cpp @@ -134,7 +134,7 @@ nsSVGTSpanElement::Init() // DOM property: nsIDOMSVGTextPositioningElement::x, #IMPLIED attrib: x { nsCOMPtr lengthList; - rv = NS_NewSVGLengthList(getter_AddRefs(lengthList), this); + rv = NS_NewSVGLengthList(getter_AddRefs(lengthList), this, nsSVGUtils::X); NS_ENSURE_SUCCESS(rv,rv); rv = NS_NewSVGAnimatedLengthList(getter_AddRefs(mX), lengthList); @@ -146,7 +146,7 @@ nsSVGTSpanElement::Init() // DOM property: nsIDOMSVGTextPositioningElement::y, #IMPLIED attrib: y { nsCOMPtr lengthList; - rv = NS_NewSVGLengthList(getter_AddRefs(lengthList), this); + rv = NS_NewSVGLengthList(getter_AddRefs(lengthList), this, nsSVGUtils::Y); NS_ENSURE_SUCCESS(rv,rv); rv = NS_NewSVGAnimatedLengthList(getter_AddRefs(mY), lengthList); @@ -158,7 +158,7 @@ nsSVGTSpanElement::Init() // DOM property: nsIDOMSVGTextPositioningElement::dx, #IMPLIED attrib: dx { nsCOMPtr lengthList; - rv = NS_NewSVGLengthList(getter_AddRefs(lengthList), this); + rv = NS_NewSVGLengthList(getter_AddRefs(lengthList), this, nsSVGUtils::X); NS_ENSURE_SUCCESS(rv,rv); rv = NS_NewSVGAnimatedLengthList(getter_AddRefs(mdX), lengthList); @@ -170,7 +170,7 @@ nsSVGTSpanElement::Init() // DOM property: nsIDOMSVGTextPositioningElement::dy, #IMPLIED attrib: dy { nsCOMPtr lengthList; - rv = NS_NewSVGLengthList(getter_AddRefs(lengthList), this); + rv = NS_NewSVGLengthList(getter_AddRefs(lengthList), this, nsSVGUtils::Y); NS_ENSURE_SUCCESS(rv,rv); rv = NS_NewSVGAnimatedLengthList(getter_AddRefs(mdY), lengthList); diff --git a/mozilla/content/svg/content/src/nsSVGTextElement.cpp b/mozilla/content/svg/content/src/nsSVGTextElement.cpp index dbd5a13ff36..668c70db2d0 100644 --- a/mozilla/content/svg/content/src/nsSVGTextElement.cpp +++ b/mozilla/content/svg/content/src/nsSVGTextElement.cpp @@ -131,7 +131,7 @@ nsSVGTextElement::Init() // DOM property: nsIDOMSVGTextPositioningElement::x, #IMPLIED attrib: x { nsCOMPtr lengthList; - rv = NS_NewSVGLengthList(getter_AddRefs(lengthList), this); + rv = NS_NewSVGLengthList(getter_AddRefs(lengthList), this, nsSVGUtils::X); NS_ENSURE_SUCCESS(rv,rv); rv = NS_NewSVGAnimatedLengthList(getter_AddRefs(mX), lengthList); @@ -143,7 +143,7 @@ nsSVGTextElement::Init() // DOM property: nsIDOMSVGTextPositioningElement::y, #IMPLIED attrib: y { nsCOMPtr lengthList; - rv = NS_NewSVGLengthList(getter_AddRefs(lengthList), this); + rv = NS_NewSVGLengthList(getter_AddRefs(lengthList), this, nsSVGUtils::Y); NS_ENSURE_SUCCESS(rv,rv); rv = NS_NewSVGAnimatedLengthList(getter_AddRefs(mY), lengthList); @@ -155,7 +155,7 @@ nsSVGTextElement::Init() // DOM property: nsIDOMSVGTextPositioningElement::dx, #IMPLIED attrib: dx { nsCOMPtr lengthList; - rv = NS_NewSVGLengthList(getter_AddRefs(lengthList), this); + rv = NS_NewSVGLengthList(getter_AddRefs(lengthList), this, nsSVGUtils::X); NS_ENSURE_SUCCESS(rv,rv); rv = NS_NewSVGAnimatedLengthList(getter_AddRefs(mdX), lengthList); @@ -167,7 +167,7 @@ nsSVGTextElement::Init() // DOM property: nsIDOMSVGTextPositioningElement::dy, #IMPLIED attrib: dy { nsCOMPtr lengthList; - rv = NS_NewSVGLengthList(getter_AddRefs(lengthList), this); + rv = NS_NewSVGLengthList(getter_AddRefs(lengthList), this, nsSVGUtils::Y); NS_ENSURE_SUCCESS(rv,rv); rv = NS_NewSVGAnimatedLengthList(getter_AddRefs(mdY), lengthList); diff --git a/mozilla/layout/svg/base/src/nsSVGTextPathFrame.cpp b/mozilla/layout/svg/base/src/nsSVGTextPathFrame.cpp index 4a5741f2206..588e84b1809 100644 --- a/mozilla/layout/svg/base/src/nsSVGTextPathFrame.cpp +++ b/mozilla/layout/svg/base/src/nsSVGTextPathFrame.cpp @@ -129,7 +129,8 @@ nsSVGTextPathFrame::Init(nsIContent* aContent, return NS_ERROR_FAILURE; NS_NewSVGLengthList(getter_AddRefs(mX), - NS_STATIC_CAST(nsSVGElement*, mContent)); + NS_STATIC_CAST(nsSVGElement*, mContent), + nsSVGUtils::X); if (mX) { nsCOMPtr length; mX->AppendItem(mStartOffset, getter_AddRefs(length));