Shrink SVG paint-order to take less bits

Source/core/style/SVGComputedStyle.h

 /*
     Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
                   2004, 2005 Rob Buis <buis@kde.org>
     Copyright (C) 2005, 2006 Apple Computer, Inc.
     Copyright (C) Research In Motion Limited 2010. All rights reserved.
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
@@ skipping 74 matching lines @@
     static float initialFloodOpacity() { return 1; }
     static Color initialFloodColor() { return Color(0, 0, 0); }
     static Color initialLightingColor() { return Color(255, 255, 255); }
     static const AtomicString& initialClipperResource() { return nullAtom; }
     static const AtomicString& initialFilterResource() { return nullAtom; }
     static const AtomicString& initialMaskerResource() { return nullAtom; }
     static const AtomicString& initialMarkerStartResource() { return nullAtom; }
     static const AtomicString& initialMarkerMidResource() { return nullAtom; }
     static const AtomicString& initialMarkerEndResource() { return nullAtom; }
     static EMaskType initialMaskType() { return MT_LUMINANCE; }
-    static EPaintOrder initialPaintOrder() { return PO_NORMAL; }
+    static EPaintOrder initialPaintOrder() { return PaintOrderNormal; }
     static Length initialCx() { return Length(Fixed); }
     static Length initialCy() { return Length(Fixed); }
     static Length initialX() { return Length(Fixed); }
     static Length initialY() { return Length(Fixed); }
     static Length initialR() { return Length(Fixed); }
     static Length initialRx() { return Length(Fixed); }
     static Length initialRy() { return Length(Fixed); }
 
     // SVG CSS Property setters
     void setAlignmentBaseline(EAlignmentBaseline val) { svg_noninherited_flags.f._alignmentBaseline = val; }
     void setDominantBaseline(EDominantBaseline val) { svg_noninherited_flags.f._dominantBaseline = val; }
     void setBaselineShift(EBaselineShift val) { svg_noninherited_flags.f._baselineShift = val; }
     void setVectorEffect(EVectorEffect val) { svg_noninherited_flags.f._vectorEffect = val; }
     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; }
     void setColorInterpolationFilters(EColorInterpolation val) { svg_inherited_flags._colorInterpolationFilters = val; }
     void setColorRendering(EColorRendering val) { 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 setWritingMode(SVGWritingMode val) { svg_inherited_flags._writingMode = val; }
     void setGlyphOrientationHorizontal(EGlyphOrientation val) { svg_inherited_flags._glyphOrientationHorizontal = val; }
     void setGlyphOrientationVertical(EGlyphOrientation val) { svg_inherited_flags._glyphOrientationVertical = val; }
     void setMaskType(EMaskType val) { svg_noninherited_flags.f.maskType = val; }
-    void setPaintOrder(EPaintOrder val) { svg_inherited_flags._paintOrder = (int)val; }
+    void setPaintOrder(EPaintOrder val) { svg_inherited_flags.paintOrder = (int)val; }
     void setCx(const Length& obj)
     {
         if (!(layout->cx == obj))
             layout.access()->cx = obj;
     }
     void setCy(const Length& obj)
     {
         if (!(layout->cy == obj))
             layout.access()->cy = obj;
     }
@@ skipping 215 matching lines @@
     const Length& r() const { return layout->r; }
     const Length& rx() const { return layout->rx; }
     const Length& ry() const { return layout->ry; }
     const AtomicString& clipperResource() const { return resources->clipper; }
     const AtomicString& filterResource() const { return resources->filter; }
     const AtomicString& maskerResource() const { return resources->masker; }
     const AtomicString& markerStartResource() const { return inheritedResources->markerStart; }
     const AtomicString& markerMidResource() const { return inheritedResources->markerMid; }
     const AtomicString& markerEndResource() const { return inheritedResources->markerEnd; }
     EMaskType maskType() const { return (EMaskType) svg_noninherited_flags.f.maskType; }
-    EPaintOrder paintOrder() const { return (EPaintOrder) svg_inherited_flags._paintOrder; }
-    EPaintOrderType paintOrderType(unsigned index) const;
+    EPaintOrder paintOrder() const { return (EPaintOrder) svg_inherited_flags.paintOrder; }
+    Vector<EPaintOrderType, 3> paintTypesForPaintOrder() const;
 
     const SVGPaintType& visitedLinkFillPaintType() const { return fill->visitedLinkPaintType; }
     const Color& visitedLinkFillPaintColor() const { return fill->visitedLinkPaintColor; }
     const String& visitedLinkFillPaintUri() const { return fill->visitedLinkPaintUri; }
     const SVGPaintType& visitedLinkStrokePaintType() const { return stroke->visitedLinkPaintType; }
     const Color& visitedLinkStrokePaintColor() const { return stroke->visitedLinkPaintColor; }
     const String& visitedLinkStrokePaintUri() const { return stroke->visitedLinkPaintUri; }
 
     // convenience
     bool hasClipper() const { return !clipperResource().isEmpty(); }
@@ skipping 17 matching lines @@
                 && (_clipRule == other._clipRule)
                 && (_fillRule == other._fillRule)
                 && (_capStyle == other._capStyle)
                 && (_joinStyle == other._joinStyle)
                 && (_textAnchor == other._textAnchor)
                 && (_colorInterpolation == other._colorInterpolation)
                 && (_colorInterpolationFilters == other._colorInterpolationFilters)
                 && (_writingMode == other._writingMode)
                 && (_glyphOrientationHorizontal == other._glyphOrientationHorizontal)
                 && (_glyphOrientationVertical == other._glyphOrientationVertical)
-                && (_paintOrder == other._paintOrder);
+                && (paintOrder == other.paintOrder);
         }
 
         bool operator!=(const InheritedFlags& other) const
         {
             return !(*this == other);
         }
 
         unsigned _colorRendering : 2; // EColorRendering
         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 _writingMode : 3; // SVGWritingMode
         unsigned _glyphOrientationHorizontal : 3; // EGlyphOrientation
         unsigned _glyphOrientationVertical : 3; // EGlyphOrientation
-        unsigned _paintOrder : 6; // EPaintOrder
+        unsigned paintOrder : 3; // EPaintOrder
     } svg_inherited_flags;
 
     // don't inherit
     struct NonInheritedFlags {
         // 32 bit non-inherited, don't add to the struct, or the operator will break.
         bool operator==(const NonInheritedFlags &other) const { return _niflags == other._niflags; }
         bool operator!=(const NonInheritedFlags &other) const { return _niflags != other._niflags; }
 
         union {
             struct {
@@ skipping 37 matching lines @@
         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._writingMode = initialWritingMode();
         svg_inherited_flags._glyphOrientationHorizontal = initialGlyphOrientationHorizontal();
         svg_inherited_flags._glyphOrientationVertical = initialGlyphOrientationVertical();
-        svg_inherited_flags._paintOrder = initialPaintOrder();
+        svg_inherited_flags.paintOrder = initialPaintOrder();
 
         svg_noninherited_flags._niflags = 0;
         svg_noninherited_flags.f._alignmentBaseline = initialAlignmentBaseline();
         svg_noninherited_flags.f._dominantBaseline = initialDominantBaseline();
         svg_noninherited_flags.f._baselineShift = initialBaselineShift();
         svg_noninherited_flags.f._vectorEffect = initialVectorEffect();
         svg_noninherited_flags.f.bufferedRendering = initialBufferedRendering();
         svg_noninherited_flags.f.maskType = initialMaskType();
     }
 };
 
 } // namespace blink
 
 #endif // SVGComputedStyle_h