Bug 854296, part 1 - Make SVG respect stroke-miterlimit again. r=Bas
authorJonathan Watt <jwatt@jwatt.org>
Tue, 16 Dec 2014 15:31:28 +0000
changeset 220184 91928ad7ef735af8898d6e00e658cbea62b21a9e
parent 220183 6d81c1303dafce97229e6eacca553f8efe0421ab
child 220185 83d940ea14917590f31278f63cae7c759902604b
push id10457
push userryanvm@gmail.com
push dateThu, 18 Dec 2014 01:54:25 +0000
treeherderfx-team@0e441ff66c5e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersBas
bugs854296
milestone37.0a1
Bug 854296, part 1 - Make SVG respect stroke-miterlimit again. r=Bas
dom/svg/SVGContentUtils.cpp
layout/svg/nsSVGUtils.cpp
--- a/dom/svg/SVGContentUtils.cpp
+++ b/dom/svg/SVGContentUtils.cpp
@@ -194,17 +194,17 @@ SVGContentUtils::GetStrokeOptions(AutoSt
 
   aStrokeOptions->mLineWidth =
     GetStrokeWidth(aElement, styleContext, aContextPaint);
 
   aStrokeOptions->mMiterLimit = Float(styleSVG->mStrokeMiterlimit);
 
   switch (styleSVG->mStrokeLinejoin) {
   case NS_STYLE_STROKE_LINEJOIN_MITER:
-    aStrokeOptions->mLineJoin = JoinStyle::MITER;
+    aStrokeOptions->mLineJoin = JoinStyle::MITER_OR_BEVEL;
     break;
   case NS_STYLE_STROKE_LINEJOIN_ROUND:
     aStrokeOptions->mLineJoin = JoinStyle::ROUND;
     break;
   case NS_STYLE_STROKE_LINEJOIN_BEVEL:
     aStrokeOptions->mLineJoin = JoinStyle::BEVEL;
     break;
   }
--- a/layout/svg/nsSVGUtils.cpp
+++ b/layout/svg/nsSVGUtils.cpp
@@ -1502,17 +1502,17 @@ nsSVGUtils::SetupCairoStrokeGeometry(nsI
     aContext->SetLineCap(CapStyle::SQUARE);
     break;
   }
 
   aContext->SetMiterLimit(style->mStrokeMiterlimit);
 
   switch (style->mStrokeLinejoin) {
   case NS_STYLE_STROKE_LINEJOIN_MITER:
-    aContext->SetLineJoin(JoinStyle::MITER);
+    aContext->SetLineJoin(JoinStyle::MITER_OR_BEVEL);
     break;
   case NS_STYLE_STROKE_LINEJOIN_ROUND:
     aContext->SetLineJoin(JoinStyle::ROUND);
     break;
   case NS_STYLE_STROKE_LINEJOIN_BEVEL:
     aContext->SetLineJoin(JoinStyle::BEVEL);
     break;
   }