Bug 1178159 - Ignore stroke-linecap:"square" on circle and ellipse. r…

…=longsonr
Brli · Jun 29, 2015 · 4989c72 · 4989c72
1 parent ad1cf4a
commit 4989c72
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 12 deletions.
diff --git a/dom/svg/SVGContentUtils.cpp b/dom/svg/SVGContentUtils.cpp
@@ -220,16 +220,21 @@ SVGContentUtils::GetStrokeOptions(AutoStrokeOptions* aStrokeOptions,
     break;
   }
 
-  switch (styleSVG->mStrokeLinecap) {
-  case NS_STYLE_STROKE_LINECAP_BUTT:
+  if (ShapeTypeHasNoCorners(aElement)) {
     aStrokeOptions->mLineCap = CapStyle::BUTT;
-    break;
-  case NS_STYLE_STROKE_LINECAP_ROUND:
-    aStrokeOptions->mLineCap = CapStyle::ROUND;
-    break;
-  case NS_STYLE_STROKE_LINECAP_SQUARE:
-    aStrokeOptions->mLineCap = CapStyle::SQUARE;
-    break;
+  }
+  else {
+    switch (styleSVG->mStrokeLinecap) {
+      case NS_STYLE_STROKE_LINECAP_BUTT:
+        aStrokeOptions->mLineCap = CapStyle::BUTT;
+        break;
+      case NS_STYLE_STROKE_LINECAP_ROUND:
+        aStrokeOptions->mLineCap = CapStyle::ROUND;
+        break;
+      case NS_STYLE_STROKE_LINECAP_SQUARE:
+        aStrokeOptions->mLineCap = CapStyle::SQUARE;
+        break;
+    }
   }
 }
 
@@ -808,3 +813,9 @@ SVGContentUtils::GetPath(const nsAString& aPathString)
 
   return pathData.BuildPath(builder, NS_STYLE_STROKE_LINECAP_BUTT, 1);
 }
+
+bool
+SVGContentUtils::ShapeTypeHasNoCorners(const nsIContent* aContent) {
+  return aContent && aContent->IsAnyOfSVGElements(nsGkAtoms::circle,
+                                                  nsGkAtoms::ellipse);
+}
diff --git a/dom/svg/SVGContentUtils.h b/dom/svg/SVGContentUtils.h
@@ -323,6 +323,12 @@ class SVGContentUtils
    */
   static mozilla::TemporaryRef<mozilla::gfx::Path>
   GetPath(const nsAString& aPathString);
+
+  /**
+   *  Returns true if aContent is one of the elements whose stroke is guaranteed
+   *  to have no corners: circle or ellipse
+   */
+  static bool ShapeTypeHasNoCorners(const nsIContent* aContent);
 };
 
 #endif
diff --git a/layout/reftests/svg/reftest.list b/layout/reftests/svg/reftest.list
@@ -291,6 +291,7 @@ fuzzy-if(cocoaWidget,4,15982) fuzzy-if(winWidget,4,92) == radialGradient-basic-0
 == rootElement-null-01.svg pass.svg
 == script-empty-01.svg pass.svg
 == selector-01.svg pass.svg
+== stroke-linecap-circle-ellipse-01.svg stroke-linecap-circle-ellipse-01-ref.svg
 == stroke-width-percentage-01.svg pass.svg
 == stroke-width-percentage-02a.svg stroke-width-percentage-02-ref.svg
 == stroke-width-percentage-02b.svg stroke-width-percentage-02-ref.svg

diff --git a/layout/reftests/svg/stroke-linecap-circle-ellipse-01-ref.svg b/layout/reftests/svg/stroke-linecap-circle-ellipse-01-ref.svg
diff --git a/layout/reftests/svg/stroke-linecap-circle-ellipse-01.svg b/layout/reftests/svg/stroke-linecap-circle-ellipse-01.svg
diff --git a/layout/svg/nsSVGPathGeometryFrame.cpp b/layout/svg/nsSVGPathGeometryFrame.cpp
@@ -165,7 +165,8 @@ nsSVGPathGeometryFrame::DidSetStyleContext(nsStyleContext* aOldStyleContext)
     nsSVGPathGeometryElement* element =
       static_cast<nsSVGPathGeometryElement*>(mContent);
 
-    if (aOldStyleContext->PeekStyleSVG()) {
+    if (aOldStyleContext->PeekStyleSVG() &&
+        !SVGContentUtils::ShapeTypeHasNoCorners(mContent)) {
       if ((StyleSVG()->mStrokeLinecap !=
              aOldStyleContext->PeekStyleSVG()->mStrokeLinecap) &&
           element->IsSVGElement(nsGkAtoms::path)) {

diff --git a/layout/svg/nsSVGUtils.cpp b/layout/svg/nsSVGUtils.cpp
@@ -1197,8 +1197,7 @@ nsSVGUtils::PathExtentsToMaxStrokeExtents(const gfxRect& aPathExtents,
                                           const gfxMatrix& aMatrix)
 {
   bool strokeMayHaveCorners =
-    !aFrame->GetContent()->IsAnyOfSVGElements(nsGkAtoms::circle,
-                                              nsGkAtoms::ellipse);
+    !SVGContentUtils::ShapeTypeHasNoCorners(aFrame->GetContent());
 
   // For a shape without corners the stroke can only extend half the stroke
   // width from the path in the x/y-axis directions. For shapes with corners