Chromium Code Reviews| Index: Source/core/css/ComputedStyleCSSValueMapping.cpp |
| diff --git a/Source/core/css/ComputedStyleCSSValueMapping.cpp b/Source/core/css/ComputedStyleCSSValueMapping.cpp |
| index 06fa017c5f3c2e22a1b6f5a94e67795d9a40c9b7..53f05ac38d4eae97494dd89a60b22e5d5f9955f4 100644 |
| --- a/Source/core/css/ComputedStyleCSSValueMapping.cpp |
| +++ b/Source/core/css/ComputedStyleCSSValueMapping.cpp |
| @@ -1187,23 +1187,43 @@ static PassRefPtrWillBeRawPtr<CSSValue> strokeDashArrayToCSSValueList(const SVGD |
| static PassRefPtrWillBeRawPtr<CSSValue> paintOrderToCSSValueList(EPaintOrder paintorder) |
| { |
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated(); |
| - do { |
| - EPaintOrderType paintOrderType = (EPaintOrderType)(paintorder & ((1 << kPaintOrderBitwidth) - 1)); |
| - switch (paintOrderType) { |
| - case PT_FILL: |
| - case PT_STROKE: |
| - case PT_MARKERS: |
| - list->append(CSSPrimitiveValue::create(paintOrderType)); |
| - break; |
| - case PT_NONE: |
| - default: |
| - ASSERT_NOT_REACHED(); |
| - break; |
| - } |
| - } while (paintorder >>= kPaintOrderBitwidth); |
| + RefPtrWillBeRawPtr<CSSValueList> paintOrderList = CSSValueList::createSpaceSeparated(); |
| + |
| + switch (paintorder) { |
| + case PaintOrderNormal: |
| + case PaintOrderFillStrokeMarkers: |
|
fs
2015/07/30 14:39:36
Eep! This looks like large (code) footprint =( - c
Shanmuga Pandi
2015/07/31 08:44:50
Done.
|
| + paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueFill)); |
| + paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke)); |
| + paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers)); |
| + break; |
| + case PaintOrderFillMarkersStroke: |
| + paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueFill)); |
| + paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers)); |
| + paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke)); |
| + break; |
| + case PaintOrderStrokeFillMarkers: |
| + paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke)); |
| + paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueFill)); |
| + paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers)); |
| + break; |
| + case PaintOrderStrokeMarkersFill: |
| + paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke)); |
| + paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers)); |
| + paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueFill)); |
| + break; |
| + case PaintOrderMarkersFillStroke: |
| + paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers)); |
| + paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueFill)); |
| + paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke)); |
| + break; |
| + case PaintOrderMarkersStrokeFill: |
| + paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers)); |
| + paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke)); |
| + paintOrderList->append(CSSPrimitiveValue::createIdentifier(CSSValueFill)); |
| + break; |
| + } |
| - return list.release(); |
| + return paintOrderList.release(); |
| } |
| static PassRefPtrWillBeRawPtr<CSSValue> adjustSVGPaintForCurrentColor(SVGPaintType paintType, const String& url, const Color& color, const Color& currentColor) |