Attachment #8709153 for bug #1240275

Attachment #8709153: with more tests for bug #1240275

View | Details | Raw Unified | Return to bug 1240275
Collapse All | Expand All





GK_ATOM(font_family, "font-family")
GK_ATOM(font_size, "font-size")
GK_ATOM(font_size_adjust, "font-size-adjust")
GK_ATOM(font_stretch, "font-stretch")
GK_ATOM(font_style, "font-style")
GK_ATOM(font_variant, "font-variant")
GK_ATOM(foreignObject, "foreignObject")
GK_ATOM(fractalNoise, "fractalNoise")
GK_ATOM(fr, "fr")
GK_ATOM(fx, "fx")
GK_ATOM(fy, "fy")
GK_ATOM(G, "G")
GK_ATOM(g, "g")
GK_ATOM(gamma, "gamma")
// 'generic' conflicts with msvc11 winrt compiler extensions
GK_ATOM(generic_, "generic")
GK_ATOM(glyph, "glyph")





//-------------------------- Radial Gradients ----------------------------

JSObject*
SVGRadialGradientElement::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
{
  return SVGRadialGradientElementBinding::Wrap(aCx, this, aGivenProto);
}

nsSVGElement::LengthInfo SVGRadialGradientElement::sLengthInfo[6] =
{
  { &nsGkAtoms::cx, 50, nsIDOMSVGLength::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::X },
  { &nsGkAtoms::cy, 50, nsIDOMSVGLength::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::Y },
  { &nsGkAtoms::r, 50, nsIDOMSVGLength::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::XY },
  { &nsGkAtoms::fx, 50, nsIDOMSVGLength::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::X },
  { &nsGkAtoms::fy, 50, nsIDOMSVGLength::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::Y },
  { &nsGkAtoms::fr, 0, nsIDOMSVGLength::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::XY },
};

//----------------------------------------------------------------------
// Implementation

SVGRadialGradientElement::SVGRadialGradientElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
  : SVGRadialGradientElementBase(aNodeInfo)
{

}

already_AddRefed<SVGAnimatedLength>
SVGRadialGradientElement::Fy()
{
  return mLengthAttributes[ATTR_FY].ToDOMAnimatedLength(this);
}

already_AddRefed<SVGAnimatedLength>
SVGRadialGradientElement::Fr()
{
  return mLengthAttributes[ATTR_FR].ToDOMAnimatedLength(this);
}

//----------------------------------------------------------------------
// nsSVGElement methods

nsSVGElement::LengthAttributesInfo
SVGRadialGradientElement::GetLengthInfo()
{
  return LengthAttributesInfo(mLengthAttributes, sLengthInfo,
                              ArrayLength(sLengthInfo));





  virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const override;

  // WebIDL
  already_AddRefed<SVGAnimatedLength> Cx();
  already_AddRefed<SVGAnimatedLength> Cy();
  already_AddRefed<SVGAnimatedLength> R();
  already_AddRefed<SVGAnimatedLength> Fx();
  already_AddRefed<SVGAnimatedLength> Fy();
  already_AddRefed<SVGAnimatedLength> Fr();
protected:

  virtual LengthAttributesInfo GetLengthInfo() override;

  enum { ATTR_CX, ATTR_CY, ATTR_R, ATTR_FX, ATTR_FY, ATTR_FR };
  nsSVGLength2 mLengthAttributes[6];
  static LengthInfo sLengthInfo[6];
};

} // namespace dom
} // namespace mozilla

#endif

(-)a/dom/webidl/SVGRadialGradientElement.webidl (-1 / +2 lines)

Line	Link Here

Lines 16-25 interface SVGRadialGradientElement : SVG	Link Here

  [Constant]

  [Constant]

  readonly attribute SVGAnimatedLength cy;

  readonly attribute SVGAnimatedLength cy;

  [Constant]

  [Constant]

  readonly attribute SVGAnimatedLength r;

  readonly attribute SVGAnimatedLength r;

  [Constant]

  [Constant]

  readonly attribute SVGAnimatedLength fx;

  readonly attribute SVGAnimatedLength fx;

  [Constant]

  [Constant]

  readonly attribute SVGAnimatedLength fy;

  readonly attribute SVGAnimatedLength fy;

  // readonly attribute SVGAnimatedLength fr;

  [Constant]

  readonly attribute SVGAnimatedLength fr;

};

};

-      Line
+  Link Here
-      Line 0
+  Link Here
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink">
+  <title>Test gradient fr attribute</title>
+  <defs>
+    <radialGradient id="grad1" fr="100%">
+      <stop offset="0%" stop-color="red" />
+      <stop offset="100%" stop-color="lime" />
+    </radialGradient>
+    <radialGradient id="grad2" xlink:href="#grad1"/>
+  </defs>
+  <rect width="100%" height="100%" fill="lime"/>
+  <circle cx="100" cy="100" r="50" fill="url(#grad1)" />
+  <circle cx="300" cy="100" r="50" fill="url(#grad2)" />
+</svg>

-      Line
+  Link Here
-      Line 0
+  Link Here
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink">
+  <title>Test gradient fr attribute</title>
+  <defs>
+    <radialGradient id="grad1">
+      <stop offset="0%" stop-color="red" />
+      <stop offset="20%" stop-color="red" />
+      <stop offset="100%" stop-color="lime" />
+    </radialGradient>
+  </defs>
+  <rect width="100%" height="100%" fill="lime"/>
+  <circle cx="100" cy="100" r="50" fill="url(#grad1)" />
+</svg>

-      Line
+  Link Here
-      Line 0
+  Link Here
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink">
+  <title>Test gradient fr attribute</title>
+  <defs>
+    <radialGradient id="grad1" fr="10%">
+      <stop offset="0%" stop-color="red" />
+      <stop offset="100%" stop-color="lime" />
+    </radialGradient>
+  </defs>
+  <rect width="100%" height="100%" fill="lime"/>
+  <circle cx="100" cy="100" r="50" fill="url(#grad1)" />
+</svg>





== foreignObject-style-change-01.svg pass.svg
== foreignObject-dynamic-abspos-01.html foreignObject-dynamic-abspos-01-ref.html
fuzzy-if(Android,18,600) == foreignObject-fixedpos-01.html foreignObject-dynamic-abspos-01-ref.html
== foreignObject-fixedpos-02.html foreignObject-fixedpos-ref.html
== foreignObject-dynamic-fixedpos-01.html foreignObject-dynamic-abspos-01-ref.html
== foreignObject-vertical-01.svg foreignObject-vertical-01-ref.svg
== g-transform-01.svg pass.svg
== getElementById-a-element-01.svg pass.svg
== gradient-fr-01.svg pass.svg
== gradient-fr-02.svg gradient-fr-02-ref.svg
fuzzy-if(Android||B2G,9,980||Mulet,9,980) skip-if(Mulet) == gradient-live-01a.svg gradient-live-01-ref.svg # Initial mulet triage: parity with B2G/B2G Desktop # MULET: Bug 1144079: Re-enable Mulet mochitests and reftests taskcluster-specific disables
fuzzy-if(Android||B2G,9,980||Mulet,9,980) skip-if(Mulet) == gradient-live-01b.svg gradient-live-01-ref.svg # Initial mulet triage: parity with B2G/B2G Desktop # MULET: Bug 1144079: Re-enable Mulet mochitests and reftests taskcluster-specific disables
fuzzy-if(Android||B2G,9,980||Mulet,9,980) skip-if(Mulet) == gradient-live-01c.svg gradient-live-01-ref.svg # Initial mulet triage: parity with B2G/B2G Desktop # MULET: Bug 1144079: Re-enable Mulet mochitests and reftests taskcluster-specific disables
fuzzy-if(Android||B2G,9,980||Mulet,9,980) skip-if(Mulet) == gradient-live-01d.svg gradient-live-01-ref.svg # Initial mulet triage: parity with B2G/B2G Desktop # MULET: Bug 1144079: Re-enable Mulet mochitests and reftests taskcluster-specific disables
== gradient-transform-01.svg pass.svg
== import-svg-01.html pass.svg
== invalid-text-01.svg pass.svg
== lang-attribute-01.svg pass.svg





nsSVGRadialGradientFrame::GradientVectorLengthIsZero()
{
  return GetLengthValue(dom::SVGRadialGradientElement::ATTR_R) == 0;
}

already_AddRefed<gfxPattern>
nsSVGRadialGradientFrame::CreateGradient()
{
  float cx, cy, r, fx, fy, fr;

  cx = GetLengthValue(dom::SVGRadialGradientElement::ATTR_CX);
  cy = GetLengthValue(dom::SVGRadialGradientElement::ATTR_CY);
  r  = GetLengthValue(dom::SVGRadialGradientElement::ATTR_R);
  // If fx or fy are not set, use cx/cy instead
  fx = GetLengthValue(dom::SVGRadialGradientElement::ATTR_FX, cx);
  fy = GetLengthValue(dom::SVGRadialGradientElement::ATTR_FY, cy);
  fr = GetLengthValue(dom::SVGRadialGradientElement::ATTR_FR);

  if (fx != cx || fy != cy) {
    // The focal point (fFx and fFy) must be clamped to be *inside* - not on -
    // the circumference of the gradient or we'll get rendering anomalies. We
    // calculate the distance from the focal point to the gradient center and
    // make sure it is *less* than the gradient radius.
    // 1/128 is the limit of the fractional part of cairo's 24.8 fixed point
    // representation divided by 2 to ensure that we get different cairo

    double d = sqrt((dx * dx) + (dy * dy));
    if (d > dMax) {
      double angle = atan2(dy, dx);
      fx = (float)(dMax * cos(angle)) + cx;
      fy = (float)(dMax * sin(angle)) + cy;
    }
  }

  RefPtr<gfxPattern> pattern = new gfxPattern(fx, fy, fr, cx, cy, r);
  return pattern.forget();
}

// -------------------------------------------------------------------------
// Public functions
// -------------------------------------------------------------------------

nsIFrame*





    expected: FAIL

  [SVGElement interface: linearGradient must inherit property "onsort" with the proper type (61)]
    expected: FAIL

  [SVGElement interface: linearGradient must inherit property "ontoggle" with the proper type (66)]
    expected: FAIL

  [SVGRadialGradientElement interface: attribute fr]
    expected: FAIL

  [SVGRadialGradientElement interface: radialGradient must inherit property "fr" with the proper type (5)]
    expected: FAIL

  [SVGElement interface: radialGradient must inherit property "tabIndex" with the proper type (3)]
    expected: FAIL

  [SVGElement interface: radialGradient must inherit property "focus" with the proper type (4)]
    expected: FAIL

  [SVGElement interface: radialGradient must inherit property "blur" with the proper type (5)]
    expected: FAIL

Return to bug 1240275