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

third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp

 /*
  * Copyright (C) 2004 Zack Rusin <zack@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
  * All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
  * Copyright (C) 2011 Sencha, Inc. All rights reserved.
  * Copyright (C) 2015 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 80 matching lines @@
   return zoomAdjustedPixelValue(length.value(), style);
 }
 
 static CSSValue* zoomAdjustedPixelValueForLength(const Length& length,
                                                  const ComputedStyle& style) {
   if (length.isFixed())
     return zoomAdjustedPixelValue(length.value(), style);
   return CSSValue::create(length, style.effectiveZoom());
 }
 
-static CSSValue* pixelValueForUnzoomedLength(
-    const UnzoomedLength& unzoomedLength,
-    const ComputedStyle& style) {
+static CSSValue* pixelValueForUnzoomedLength(const ComputedStyle& style) {
+  const UnzoomedLength unzoomedLength = style.strokeWidth();
   const Length& length = unzoomedLength.length();
   if (length.isFixed())
     return CSSPrimitiveValue::create(length.value(),
                                      CSSPrimitiveValue::UnitType::Pixels);
   return CSSValue::create(length, style.effectiveZoom());
 }
 
 static CSSValueList* createPositionListForLayer(CSSPropertyID propertyID,
                                                 const FillLayer& layer,
                                                 const ComputedStyle& style) {
@@ skipping 1544 matching lines @@
   if (dashes.isEmpty())
     return CSSIdentifierValue::create(CSSValueNone);
 
   CSSValueList* list = CSSValueList::createCommaSeparated();
   for (const Length& dashLength : dashes.vector())
     list->append(*zoomAdjustedPixelValueForLength(dashLength, style));
 
   return list;
 }
 
-static CSSValue* paintOrderToCSSValueList(const SVGComputedStyle& svgStyle) {
+static CSSValue* paintOrderToCSSValueList(const ComputedStyle& style) {
   CSSValueList* list = CSSValueList::createSpaceSeparated();
   for (int i = 0; i < 3; i++) {
-    EPaintOrderType paintOrderType = svgStyle.paintOrderType(i);
+    EPaintOrderType paintOrderType = style.paintOrderType(i);
     switch (paintOrderType) {
       case PT_FILL:
       case PT_STROKE:
       case PT_MARKERS:
         list->append(*CSSIdentifierValue::create(paintOrderType));
         break;
       case PT_NONE:
       default:
         ASSERT_NOT_REACHED();
         break;
@@ skipping 1675 matching lines @@
     case CSSPropertyOffsetRotate:
     case CSSPropertyOffsetRotation: {
       CSSValueList* list = CSSValueList::createSpaceSeparated();
       if (style.offsetRotation().type == OffsetRotationAuto)
         list->append(*CSSIdentifierValue::create(CSSValueAuto));
       list->append(*CSSPrimitiveValue::create(
           style.offsetRotation().angle, CSSPrimitiveValue::UnitType::Degrees));
       return list;
     }
 
+    case CSSPropertyStrokeLinecap:
+      return CSSIdentifierValue::create(style.capStyle());
+    case CSSPropertyStrokeLinejoin:
+      return CSSIdentifierValue::create(style.joinStyle());
+    case CSSPropertyPaintOrder:
+      return paintOrderToCSSValueList(style);
+    case CSSPropertyStrokeWidth:
+      return pixelValueForUnzoomedLength(style);
+
     // Unimplemented CSS 3 properties (including CSS3 shorthand properties).
     case CSSPropertyWebkitTextEmphasis:
       return nullptr;
 
     // Directional properties are resolved by resolveDirectionAwareProperty()
     // before the switch.
     case CSSPropertyBlockSize:
     case CSSPropertyInlineSize:
     case CSSPropertyMaxBlockSize:
     case CSSPropertyMaxInlineSize:
@@ skipping 77 matching lines @@
       return CSSIdentifierValue::create(svgStyle.colorInterpolationFilters());
     case CSSPropertyFillOpacity:
       return CSSPrimitiveValue::create(svgStyle.fillOpacity(),
                                        CSSPrimitiveValue::UnitType::Number);
     case CSSPropertyFillRule:
       return CSSIdentifierValue::create(svgStyle.fillRule());
     case CSSPropertyColorRendering:
       return CSSIdentifierValue::create(svgStyle.colorRendering());
     case CSSPropertyShapeRendering:
       return CSSIdentifierValue::create(svgStyle.shapeRendering());
-    case CSSPropertyStrokeLinecap:
-      return CSSIdentifierValue::create(svgStyle.capStyle());
-    case CSSPropertyStrokeLinejoin:
-      return CSSIdentifierValue::create(svgStyle.joinStyle());
     case CSSPropertyStrokeMiterlimit:
       return CSSPrimitiveValue::create(svgStyle.strokeMiterLimit(),
                                        CSSPrimitiveValue::UnitType::Number);
     case CSSPropertyStrokeOpacity:
       return CSSPrimitiveValue::create(svgStyle.strokeOpacity(),
                                        CSSPrimitiveValue::UnitType::Number);
     case CSSPropertyAlignmentBaseline:
       return CSSIdentifierValue::create(svgStyle.alignmentBaseline());
     case CSSPropertyDominantBaseline:
       return CSSIdentifierValue::create(svgStyle.dominantBaseline());
@@ skipping 31 matching lines @@
       return CSSIdentifierValue::create(CSSValueNone);
     case CSSPropertyStroke:
       return adjustSVGPaintForCurrentColor(
           svgStyle.strokePaintType(), svgStyle.strokePaintUri(),
           svgStyle.strokePaintColor(), style.color());
     case CSSPropertyStrokeDasharray:
       return strokeDashArrayToCSSValueList(*svgStyle.strokeDashArray(), style);
     case CSSPropertyStrokeDashoffset:
       return zoomAdjustedPixelValueForLength(svgStyle.strokeDashOffset(),
                                              style);
-    case CSSPropertyStrokeWidth:
-      return pixelValueForUnzoomedLength(svgStyle.strokeWidth(), style);
     case CSSPropertyBaselineShift: {
       switch (svgStyle.baselineShift()) {
         case BS_SUPER:
           return CSSIdentifierValue::create(CSSValueSuper);
         case BS_SUB:
           return CSSIdentifierValue::create(CSSValueSub);
         case BS_LENGTH:
           return zoomAdjustedPixelValueForLength(svgStyle.baselineShiftValue(),
                                                  style);
       }
       ASSERT_NOT_REACHED();
       return nullptr;
     }
     case CSSPropertyBufferedRendering:
       return CSSIdentifierValue::create(svgStyle.bufferedRendering());
-    case CSSPropertyPaintOrder:
-      return paintOrderToCSSValueList(svgStyle);
     case CSSPropertyVectorEffect:
       return CSSIdentifierValue::create(svgStyle.vectorEffect());
     case CSSPropertyMaskType:
       return CSSIdentifierValue::create(svgStyle.maskType());
     case CSSPropertyMarker:
       // the above properties are not yet implemented in the engine
       return nullptr;
     case CSSPropertyD:
       if (const StylePath* stylePath = svgStyle.d())
         return stylePath->computedCSSValue();
@@ skipping 115 matching lines @@
     case CSSPropertyAll:
       return nullptr;
     default:
       break;
   }
   ASSERT_NOT_REACHED();
   return nullptr;
 }
 
 }  // namespace blink