Shrink SVG paint-order to take less bits

Source/core/style/SVGComputedStyle.cpp

 /*
     Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
                   2004, 2005, 2010 Rob Buis <buis@kde.org>
     Copyright (C) Research In Motion Limited 2010. All rights reserved.
 
     Based on khtml code by:
     Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
     Copyright (C) 1999-2003 Lars Knoll (knoll@kde.org)
     Copyright (C) 2002-2003 Dirk Mueller (mueller@kde.org)
     Copyright (C) 2002 Apple Computer, Inc.
@@ skipping 13 matching lines @@
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
 
 #include "config.h"
 
 #include "core/style/SVGComputedStyle.h"
 
 namespace blink {
 
+static const int kPaintOrderBitwidth = 2;
+
 SVGComputedStyle::SVGComputedStyle()
 {
     static SVGComputedStyle* initialStyle = new SVGComputedStyle(CreateInitial);
 
     fill = initialStyle->fill;
     stroke = initialStyle->stroke;
     stops = initialStyle->stops;
     misc = initialStyle->misc;
     inheritedResources = initialStyle->inheritedResources;
     layout = initialStyle->layout;
@@ skipping 185 matching lines @@
     if (stops != other->stops)
         return true;
 
     // Changes of these flags only cause paint invalidations.
     if (svg_inherited_flags._colorRendering != other->svg_inherited_flags._colorRendering
         || svg_inherited_flags._shapeRendering != other->svg_inherited_flags._shapeRendering
         || svg_inherited_flags._clipRule != other->svg_inherited_flags._clipRule
         || svg_inherited_flags._fillRule != other->svg_inherited_flags._fillRule
         || svg_inherited_flags._colorInterpolation != other->svg_inherited_flags._colorInterpolation
         || svg_inherited_flags._colorInterpolationFilters != other->svg_inherited_flags._colorInterpolationFilters
-        || svg_inherited_flags._paintOrder != other->svg_inherited_flags._paintOrder)
+        || svg_inherited_flags.paintOrder != other->svg_inherited_flags.paintOrder)
         return true;
 
     if (svg_noninherited_flags.f.bufferedRendering != other->svg_noninherited_flags.f.bufferedRendering)
         return true;
 
     if (svg_noninherited_flags.f.maskType != other->svg_noninherited_flags.f.maskType)
         return true;
 
     return false;
 }
 
+unsigned paintOrderSequence(EPaintOrderType first, EPaintOrderType second, EPaintOrderType third)
+{
+    return (((third << kPaintOrderBitwidth) | second) << kPaintOrderBitwidth) | first;
+}
+
 EPaintOrderType SVGComputedStyle::paintOrderType(unsigned index) const
 {
+    unsigned pt = 0;
     ASSERT(index < ((1 << kPaintOrderBitwidth)-1));
-    unsigned pt = (paintOrder() >> (kPaintOrderBitwidth*index)) & ((1u << kPaintOrderBitwidth) - 1);
+    switch (this->paintOrder()) {
+    case PaintOrderNormal:
+    case PaintOrderFillStrokeMarkers:
+        pt = paintOrderSequence(PT_FILL, PT_STROKE, PT_MARKERS);
+        break;
+    case PaintOrderFillMarkersStroke:
+        pt = paintOrderSequence(PT_FILL, PT_MARKERS, PT_STROKE);
+        break;
+    case PaintOrderStrokeFillMarkers:
+        pt = paintOrderSequence(PT_STROKE, PT_FILL, PT_MARKERS);
+        break;
+    case PaintOrderStrokeMarkersFill:
+        pt = paintOrderSequence(PT_STROKE, PT_MARKERS, PT_FILL);
+        break;
+    case PaintOrderMarkersFillStroke:
+        pt = paintOrderSequence(PT_MARKERS, PT_FILL, PT_STROKE);
+        break;
+    case PaintOrderMarkersStrokeFill:
+        pt = paintOrderSequence(PT_MARKERS, PT_STROKE, PT_FILL);
+        break;
+    }
+
+    pt = (pt >> (kPaintOrderBitwidth*index)) & ((1u << kPaintOrderBitwidth) - 1);
     return (EPaintOrderType)pt;
 }
 
 }