Apply SVG styles paint-order, stroke-linejoin, and stroke-linecap on DOM text

third_party/WebKit/Source/core/style/SVGComputedStyle.h

Index: third_party/WebKit/Source/core/style/SVGComputedStyle.h
diff --git a/third_party/WebKit/Source/core/style/SVGComputedStyle.h b/third_party/WebKit/Source/core/style/SVGComputedStyle.h
index 5c35d1ae2940ad6d5b13bf33e2f9a53d2396e766..215a56f12681f855cdaec105d79a8db769b90626 100644
--- a/third_party/WebKit/Source/core/style/SVGComputedStyle.h
+++ b/third_party/WebKit/Source/core/style/SVGComputedStyle.h
@@ -65,7 +65,6 @@ class CORE_EXPORT SVGComputedStyle : public RefCounted<SVGComputedStyle> {
   static Length initialBaselineShiftValue() { return Length(Fixed); }
   static EVectorEffect initialVectorEffect() { return VE_NONE; }
   static EBufferedRendering initialBufferedRendering() { return BR_AUTO; }
-  static LineCap initialCapStyle() { return ButtCap; }
   static WindRule initialClipRule() { return RULE_NONZERO; }
   static EColorInterpolation initialColorInterpolation() { return CI_SRGB; }
   static EColorInterpolation initialColorInterpolationFilters() {
@@ -73,7 +72,6 @@ class CORE_EXPORT SVGComputedStyle : public RefCounted<SVGComputedStyle> {
   }
   static EColorRendering initialColorRendering() { return CR_AUTO; }
   static WindRule initialFillRule() { return RULE_NONZERO; }
-  static LineJoin initialJoinStyle() { return MiterJoin; }
   static EShapeRendering initialShapeRendering() { return SR_AUTO; }
   static ETextAnchor initialTextAnchor() { return TA_START; }
   static float initialFillOpacity() { return 1; }
@@ -87,9 +85,6 @@ class CORE_EXPORT SVGComputedStyle : public RefCounted<SVGComputedStyle> {
   static PassRefPtr<SVGDashArray> initialStrokeDashArray();
   static Length initialStrokeDashOffset() { return Length(Fixed); }
   static float initialStrokeMiterLimit() { return 4; }
-  static UnzoomedLength initialStrokeWidth() {
-    return UnzoomedLength(Length(1, Fixed));
-  }
   static float initialStopOpacity() { return 1; }
   static Color initialStopColor() { return Color(0, 0, 0); }
   static float initialFloodOpacity() { return 1; }
@@ -100,7 +95,6 @@ class CORE_EXPORT SVGComputedStyle : public RefCounted<SVGComputedStyle> {
   static const AtomicString& initialMarkerMidResource() { return nullAtom; }
   static const AtomicString& initialMarkerEndResource() { return nullAtom; }
   static EMaskType initialMaskType() { return MT_LUMINANCE; }
-  static EPaintOrder initialPaintOrder() { return PaintOrderNormal; }
   static StylePath* initialD() { return nullptr; }
   static Length initialCx() { return Length(Fixed); }
   static Length initialCy() { return Length(Fixed); }
@@ -126,7 +120,6 @@ class CORE_EXPORT SVGComputedStyle : public RefCounted<SVGComputedStyle> {
   void setBufferedRendering(EBufferedRendering val) {
     svg_noninherited_flags.f.bufferedRendering = val;
   }
-  void setCapStyle(LineCap val) { svg_inherited_flags.capStyle = val; }
   void setClipRule(WindRule val) { svg_inherited_flags.clipRule = val; }
   void setColorInterpolation(EColorInterpolation val) {
     svg_inherited_flags.colorInterpolation = val;
@@ -138,15 +131,11 @@ class CORE_EXPORT SVGComputedStyle : public RefCounted<SVGComputedStyle> {
     svg_inherited_flags.colorRendering = val;
   }
   void setFillRule(WindRule val) { svg_inherited_flags.fillRule = val; }
-  void setJoinStyle(LineJoin val) { svg_inherited_flags.joinStyle = val; }
   void setShapeRendering(EShapeRendering val) {
     svg_inherited_flags.shapeRendering = val;
   }
   void setTextAnchor(ETextAnchor val) { svg_inherited_flags.textAnchor = val; }
   void setMaskType(EMaskType val) { svg_noninherited_flags.f.maskType = val; }
-  void setPaintOrder(EPaintOrder val) {
-    svg_inherited_flags.paintOrder = (int)val;
-  }
   void setD(PassRefPtr<StylePath> d) {
     if (!(geometry->d == d))
       geometry.access()->d = d;
@@ -245,11 +234,6 @@ class CORE_EXPORT SVGComputedStyle : public RefCounted<SVGComputedStyle> {
       stroke.access()->miterLimit = obj;
   }
 
-  void setStrokeWidth(const UnzoomedLength& strokeWidth) {
-    if (!(stroke->width == strokeWidth))
-      stroke.access()->width = strokeWidth;
-  }
-
   void setStrokeDashOffset(const Length& dashOffset) {
     if (!(stroke->dashOffset == dashOffset))
       stroke.access()->dashOffset = dashOffset;
@@ -323,7 +307,6 @@ class CORE_EXPORT SVGComputedStyle : public RefCounted<SVGComputedStyle> {
   EBufferedRendering bufferedRendering() const {
     return (EBufferedRendering)svg_noninherited_flags.f.bufferedRendering;
   }
-  LineCap capStyle() const { return (LineCap)svg_inherited_flags.capStyle; }
   WindRule clipRule() const { return (WindRule)svg_inherited_flags.clipRule; }
   EColorInterpolation colorInterpolation() const {
     return (EColorInterpolation)svg_inherited_flags.colorInterpolation;
@@ -335,7 +318,6 @@ class CORE_EXPORT SVGComputedStyle : public RefCounted<SVGComputedStyle> {
     return (EColorRendering)svg_inherited_flags.colorRendering;
   }
   WindRule fillRule() const { return (WindRule)svg_inherited_flags.fillRule; }
-  LineJoin joinStyle() const { return (LineJoin)svg_inherited_flags.joinStyle; }
   EShapeRendering shapeRendering() const {
     return (EShapeRendering)svg_inherited_flags.shapeRendering;
   }
@@ -352,7 +334,6 @@ class CORE_EXPORT SVGComputedStyle : public RefCounted<SVGComputedStyle> {
   const String& strokePaintUri() const { return stroke->paintUri; }
   SVGDashArray* strokeDashArray() const { return stroke->dashArray.get(); }
   float strokeMiterLimit() const { return stroke->miterLimit; }
-  const UnzoomedLength& strokeWidth() const { return stroke->width; }
   const Length& strokeDashOffset() const { return stroke->dashOffset; }
   float stopOpacity() const { return stops->opacity; }
   const Color& stopColor() const { return stops->color; }
@@ -381,11 +362,6 @@ class CORE_EXPORT SVGComputedStyle : public RefCounted<SVGComputedStyle> {
   EMaskType maskType() const {
     return (EMaskType)svg_noninherited_flags.f.maskType;
   }
-  EPaintOrder paintOrder() const {
-    return (EPaintOrder)svg_inherited_flags.paintOrder;
-  }
-  EPaintOrderType paintOrderType(unsigned index) const;
-
   const SVGPaintType& visitedLinkFillPaintType() const {
     return fill->visitedLinkPaintType;
   }
@@ -426,11 +402,6 @@ class CORE_EXPORT SVGComputedStyle : public RefCounted<SVGComputedStyle> {
            !markerEndResource().isEmpty();
   }
   bool hasStroke() const { return strokePaintType() != SVG_PAINTTYPE_NONE; }
-  bool hasVisibleStroke() const {
-    return hasStroke() && !strokeWidth().isZero();
-  }
-  bool hasSquareCapStyle() const { return capStyle() == SquareCap; }
-  bool hasMiterJoinStyle() const { return joinStyle() == MiterJoin; }
   bool hasFill() const { return fillPaintType() != SVG_PAINTTYPE_NONE; }
 
  protected:
@@ -440,11 +411,9 @@ class CORE_EXPORT SVGComputedStyle : public RefCounted<SVGComputedStyle> {
       return (colorRendering == other.colorRendering) &&
              (shapeRendering == other.shapeRendering) &&
              (clipRule == other.clipRule) && (fillRule == other.fillRule) &&
-             (capStyle == other.capStyle) && (joinStyle == other.joinStyle) &&
              (textAnchor == other.textAnchor) &&
              (colorInterpolation == other.colorInterpolation) &&
              (colorInterpolationFilters == other.colorInterpolationFilters) &&
-             (paintOrder == other.paintOrder) &&
              (dominantBaseline == other.dominantBaseline);
     }
 
@@ -456,12 +425,9 @@ class CORE_EXPORT SVGComputedStyle : public RefCounted<SVGComputedStyle> {
     unsigned shapeRendering : 2;             // EShapeRendering
     unsigned clipRule : 1;                   // WindRule
     unsigned fillRule : 1;                   // WindRule
-    unsigned capStyle : 2;                   // LineCap
-    unsigned joinStyle : 2;                  // LineJoin
     unsigned textAnchor : 2;                 // ETextAnchor
     unsigned colorInterpolation : 2;         // EColorInterpolation
     unsigned colorInterpolationFilters : 2;  // EColorInterpolation_
-    unsigned paintOrder : 3;                 // EPaintOrder
     unsigned dominantBaseline : 4;           // EDominantBaseline
   } svg_inherited_flags;
 
@@ -517,12 +483,9 @@ class CORE_EXPORT SVGComputedStyle : public RefCounted<SVGComputedStyle> {
     svg_inherited_flags.fillRule = initialFillRule();
     svg_inherited_flags.shapeRendering = initialShapeRendering();
     svg_inherited_flags.textAnchor = initialTextAnchor();
-    svg_inherited_flags.capStyle = initialCapStyle();
-    svg_inherited_flags.joinStyle = initialJoinStyle();
     svg_inherited_flags.colorInterpolation = initialColorInterpolation();
     svg_inherited_flags.colorInterpolationFilters =
         initialColorInterpolationFilters();
-    svg_inherited_flags.paintOrder = initialPaintOrder();
     svg_inherited_flags.dominantBaseline = initialDominantBaseline();
 
     svg_noninherited_flags.niflags = 0;