зеркало из https://github.com/mozilla/gecko-dev.git
Bug 266183 - correct default values for gradient attributes.
Patch by scootermorris@comcast.net, r=tor
This commit is contained in:
Родитель
afac31a3ea
Коммит
81860a3572
|
@ -314,7 +314,7 @@ nsSVGLinearGradientElement::Init()
|
||||||
{
|
{
|
||||||
nsCOMPtr<nsISVGLength> length;
|
nsCOMPtr<nsISVGLength> length;
|
||||||
rv = NS_NewSVGLength(getter_AddRefs(length),
|
rv = NS_NewSVGLength(getter_AddRefs(length),
|
||||||
0.0f);
|
0.0,nsIDOMSVGLength::SVG_LENGTHTYPE_PERCENTAGE);
|
||||||
NS_ENSURE_SUCCESS(rv,rv);
|
NS_ENSURE_SUCCESS(rv,rv);
|
||||||
rv = NS_NewSVGAnimatedLength(getter_AddRefs(mX1), length);
|
rv = NS_NewSVGAnimatedLength(getter_AddRefs(mX1), length);
|
||||||
NS_ENSURE_SUCCESS(rv,rv);
|
NS_ENSURE_SUCCESS(rv,rv);
|
||||||
|
@ -326,7 +326,7 @@ nsSVGLinearGradientElement::Init()
|
||||||
{
|
{
|
||||||
nsCOMPtr<nsISVGLength> length;
|
nsCOMPtr<nsISVGLength> length;
|
||||||
rv = NS_NewSVGLength(getter_AddRefs(length),
|
rv = NS_NewSVGLength(getter_AddRefs(length),
|
||||||
0.0f);
|
0.0,nsIDOMSVGLength::SVG_LENGTHTYPE_PERCENTAGE);
|
||||||
NS_ENSURE_SUCCESS(rv,rv);
|
NS_ENSURE_SUCCESS(rv,rv);
|
||||||
rv = NS_NewSVGAnimatedLength(getter_AddRefs(mY1), length);
|
rv = NS_NewSVGAnimatedLength(getter_AddRefs(mY1), length);
|
||||||
NS_ENSURE_SUCCESS(rv,rv);
|
NS_ENSURE_SUCCESS(rv,rv);
|
||||||
|
@ -338,7 +338,7 @@ nsSVGLinearGradientElement::Init()
|
||||||
{
|
{
|
||||||
nsCOMPtr<nsISVGLength> length;
|
nsCOMPtr<nsISVGLength> length;
|
||||||
rv = NS_NewSVGLength(getter_AddRefs(length),
|
rv = NS_NewSVGLength(getter_AddRefs(length),
|
||||||
1.0f);
|
100.0,nsIDOMSVGLength::SVG_LENGTHTYPE_PERCENTAGE);
|
||||||
NS_ENSURE_SUCCESS(rv,rv);
|
NS_ENSURE_SUCCESS(rv,rv);
|
||||||
rv = NS_NewSVGAnimatedLength(getter_AddRefs(mX2), length);
|
rv = NS_NewSVGAnimatedLength(getter_AddRefs(mX2), length);
|
||||||
NS_ENSURE_SUCCESS(rv,rv);
|
NS_ENSURE_SUCCESS(rv,rv);
|
||||||
|
@ -350,7 +350,7 @@ nsSVGLinearGradientElement::Init()
|
||||||
{
|
{
|
||||||
nsCOMPtr<nsISVGLength> length;
|
nsCOMPtr<nsISVGLength> length;
|
||||||
rv = NS_NewSVGLength(getter_AddRefs(length),
|
rv = NS_NewSVGLength(getter_AddRefs(length),
|
||||||
0.0f);
|
0.0,nsIDOMSVGLength::SVG_LENGTHTYPE_PERCENTAGE);
|
||||||
NS_ENSURE_SUCCESS(rv,rv);
|
NS_ENSURE_SUCCESS(rv,rv);
|
||||||
rv = NS_NewSVGAnimatedLength(getter_AddRefs(mY2), length);
|
rv = NS_NewSVGAnimatedLength(getter_AddRefs(mY2), length);
|
||||||
NS_ENSURE_SUCCESS(rv,rv);
|
NS_ENSURE_SUCCESS(rv,rv);
|
||||||
|
@ -487,7 +487,7 @@ nsSVGRadialGradientElement::Init()
|
||||||
{
|
{
|
||||||
nsCOMPtr<nsISVGLength> length;
|
nsCOMPtr<nsISVGLength> length;
|
||||||
rv = NS_NewSVGLength(getter_AddRefs(length),
|
rv = NS_NewSVGLength(getter_AddRefs(length),
|
||||||
0.0f);
|
50.0,nsIDOMSVGLength::SVG_LENGTHTYPE_PERCENTAGE);
|
||||||
NS_ENSURE_SUCCESS(rv,rv);
|
NS_ENSURE_SUCCESS(rv,rv);
|
||||||
rv = NS_NewSVGAnimatedLength(getter_AddRefs(mCx), length);
|
rv = NS_NewSVGAnimatedLength(getter_AddRefs(mCx), length);
|
||||||
NS_ENSURE_SUCCESS(rv,rv);
|
NS_ENSURE_SUCCESS(rv,rv);
|
||||||
|
@ -499,7 +499,7 @@ nsSVGRadialGradientElement::Init()
|
||||||
{
|
{
|
||||||
nsCOMPtr<nsISVGLength> length;
|
nsCOMPtr<nsISVGLength> length;
|
||||||
rv = NS_NewSVGLength(getter_AddRefs(length),
|
rv = NS_NewSVGLength(getter_AddRefs(length),
|
||||||
0.0f);
|
50.0,nsIDOMSVGLength::SVG_LENGTHTYPE_PERCENTAGE);
|
||||||
NS_ENSURE_SUCCESS(rv,rv);
|
NS_ENSURE_SUCCESS(rv,rv);
|
||||||
rv = NS_NewSVGAnimatedLength(getter_AddRefs(mCy), length);
|
rv = NS_NewSVGAnimatedLength(getter_AddRefs(mCy), length);
|
||||||
NS_ENSURE_SUCCESS(rv,rv);
|
NS_ENSURE_SUCCESS(rv,rv);
|
||||||
|
@ -511,7 +511,7 @@ nsSVGRadialGradientElement::Init()
|
||||||
{
|
{
|
||||||
nsCOMPtr<nsISVGLength> length;
|
nsCOMPtr<nsISVGLength> length;
|
||||||
rv = NS_NewSVGLength(getter_AddRefs(length),
|
rv = NS_NewSVGLength(getter_AddRefs(length),
|
||||||
0.0f);
|
50.0,nsIDOMSVGLength::SVG_LENGTHTYPE_PERCENTAGE);
|
||||||
NS_ENSURE_SUCCESS(rv,rv);
|
NS_ENSURE_SUCCESS(rv,rv);
|
||||||
rv = NS_NewSVGAnimatedLength(getter_AddRefs(mR), length);
|
rv = NS_NewSVGAnimatedLength(getter_AddRefs(mR), length);
|
||||||
NS_ENSURE_SUCCESS(rv,rv);
|
NS_ENSURE_SUCCESS(rv,rv);
|
||||||
|
@ -523,7 +523,7 @@ nsSVGRadialGradientElement::Init()
|
||||||
{
|
{
|
||||||
nsCOMPtr<nsISVGLength> length;
|
nsCOMPtr<nsISVGLength> length;
|
||||||
rv = NS_NewSVGLength(getter_AddRefs(length),
|
rv = NS_NewSVGLength(getter_AddRefs(length),
|
||||||
0.0f);
|
50.0,nsIDOMSVGLength::SVG_LENGTHTYPE_PERCENTAGE);
|
||||||
NS_ENSURE_SUCCESS(rv,rv);
|
NS_ENSURE_SUCCESS(rv,rv);
|
||||||
rv = NS_NewSVGAnimatedLength(getter_AddRefs(mFx), length);
|
rv = NS_NewSVGAnimatedLength(getter_AddRefs(mFx), length);
|
||||||
NS_ENSURE_SUCCESS(rv,rv);
|
NS_ENSURE_SUCCESS(rv,rv);
|
||||||
|
@ -535,7 +535,7 @@ nsSVGRadialGradientElement::Init()
|
||||||
{
|
{
|
||||||
nsCOMPtr<nsISVGLength> length;
|
nsCOMPtr<nsISVGLength> length;
|
||||||
rv = NS_NewSVGLength(getter_AddRefs(length),
|
rv = NS_NewSVGLength(getter_AddRefs(length),
|
||||||
0.0f);
|
50.0,nsIDOMSVGLength::SVG_LENGTHTYPE_PERCENTAGE);
|
||||||
NS_ENSURE_SUCCESS(rv,rv);
|
NS_ENSURE_SUCCESS(rv,rv);
|
||||||
rv = NS_NewSVGAnimatedLength(getter_AddRefs(mFy), length);
|
rv = NS_NewSVGAnimatedLength(getter_AddRefs(mFy), length);
|
||||||
NS_ENSURE_SUCCESS(rv,rv);
|
NS_ENSURE_SUCCESS(rv,rv);
|
||||||
|
|
|
@ -372,7 +372,7 @@ nsSVGGradientFrame::checkURITarget(const nsAString& attrStr) {
|
||||||
aGrad->HasAttribute(attrStr, &attr);
|
aGrad->HasAttribute(attrStr, &attr);
|
||||||
if (attr) {
|
if (attr) {
|
||||||
// Yes, just return
|
// Yes, just return
|
||||||
return false;
|
return PR_FALSE;
|
||||||
}
|
}
|
||||||
return checkURITarget();
|
return checkURITarget();
|
||||||
}
|
}
|
||||||
|
@ -381,12 +381,12 @@ PRBool
|
||||||
nsSVGGradientFrame::checkURITarget(void) {
|
nsSVGGradientFrame::checkURITarget(void) {
|
||||||
// Have we already figured out the next Gradient?
|
// Have we already figured out the next Gradient?
|
||||||
if (mNextGrad != nsnull) {
|
if (mNextGrad != nsnull) {
|
||||||
return true;
|
return PR_TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Do we have URI?
|
// Do we have URI?
|
||||||
if (mNextGradStr.Length() == 0) {
|
if (mNextGradStr.Length() == 0) {
|
||||||
return false; // No, return the default
|
return PR_FALSE; // No, return the default
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get the Gradient
|
// Get the Gradient
|
||||||
|
@ -395,9 +395,9 @@ nsSVGGradientFrame::checkURITarget(void) {
|
||||||
// Note that we are using *our* frame tree for this call, otherwise we're going to have
|
// Note that we are using *our* frame tree for this call, otherwise we're going to have
|
||||||
// to get the PresShell in each call
|
// to get the PresShell in each call
|
||||||
if (GetSVGGradient(&mNextGrad, aGradStr, mContent, GetPresContext()->PresShell()) == NS_OK) {
|
if (GetSVGGradient(&mNextGrad, aGradStr, mContent, GetPresContext()->PresShell()) == NS_OK) {
|
||||||
return true;
|
return PR_TRUE;
|
||||||
}
|
}
|
||||||
return false;
|
return PR_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
// -------------------------------------------------------------------------
|
// -------------------------------------------------------------------------
|
||||||
|
@ -679,12 +679,14 @@ nsSVGRadialGradientFrame::GetFx(float *aFx)
|
||||||
aRNgrad->GetFx(aFx);
|
aRNgrad->GetFx(aFx);
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
// There are no gradients in the list with our type -- fall through
|
// There are no gradients in the list with our type -- the spec
|
||||||
// and return our default value
|
// states that if there is no explicit fx value, we return the cx value
|
||||||
|
// see http://www.w3.org/TR/SVG11/pservers.html#RadialGradients
|
||||||
|
return GetCx(aFx);
|
||||||
}
|
}
|
||||||
// No, return the values
|
// No, return the values
|
||||||
nsCOMPtr<nsIDOMSVGAnimatedLength> aLen;
|
nsCOMPtr<nsIDOMSVGAnimatedLength> aLen;
|
||||||
aRgrad->GetCx(getter_AddRefs(aLen));
|
aRgrad->GetFx(getter_AddRefs(aLen));
|
||||||
nsCOMPtr<nsIDOMSVGLength> sLen;
|
nsCOMPtr<nsIDOMSVGLength> sLen;
|
||||||
aLen->GetBaseVal(getter_AddRefs(sLen));
|
aLen->GetBaseVal(getter_AddRefs(sLen));
|
||||||
sLen->GetValue(aFx);
|
sLen->GetValue(aFx);
|
||||||
|
@ -708,8 +710,10 @@ nsSVGRadialGradientFrame::GetFy(float *aFy)
|
||||||
aRNgrad->GetFy(aFy);
|
aRNgrad->GetFy(aFy);
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
// There are no gradients in the list with our type -- fall through
|
// There are no gradients in the list with our type -- the spec
|
||||||
// and return our default value
|
// states that if there is no explicit fy value, we return the cy value
|
||||||
|
// see http://www.w3.org/TR/SVG11/pservers.html#RadialGradients
|
||||||
|
return GetCy(aFy);
|
||||||
}
|
}
|
||||||
// No, return the values
|
// No, return the values
|
||||||
nsCOMPtr<nsIDOMSVGAnimatedLength> aLen;
|
nsCOMPtr<nsIDOMSVGAnimatedLength> aLen;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче