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

third_party/WebKit/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 11 matching lines @@
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
 
 #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;
   geometry = initialStyle->geometry;
   resources = initialStyle->resources;
@@ skipping 102 matching lines @@
       svg_noninherited_flags.f.alignmentBaseline !=
           other->svg_noninherited_flags.f.alignmentBaseline ||
       svg_noninherited_flags.f.baselineShift !=
           other->svg_noninherited_flags.f.baselineShift)
     return true;
 
   // Text related properties influence layout.
   if (misc->baselineShiftValue != other->misc->baselineShiftValue)
     return true;
 
-  // These properties affect the cached stroke bounding box rects.
-  if (svg_inherited_flags.capStyle != other->svg_inherited_flags.capStyle ||
-      svg_inherited_flags.joinStyle != other->svg_inherited_flags.joinStyle)
-    return true;
-
   // vector-effect changes require a re-layout.
   if (svg_noninherited_flags.f.vectorEffect !=
       other->svg_noninherited_flags.f.vectorEffect)
     return true;
 
   // Some stroke properties, requires relayouts, as the cached stroke boundaries
   // need to be recalculated.
   if (stroke.get() != other->stroke.get()) {
-    if (stroke->width != other->stroke->width ||
-        stroke->paintType != other->stroke->paintType ||
+    if (stroke->paintType != other->stroke->paintType ||
         stroke->paintColor != other->stroke->paintColor ||
         stroke->paintUri != other->stroke->paintUri ||
         stroke->miterLimit != other->stroke->miterLimit ||
         *stroke->dashArray != *other->stroke->dashArray ||
         stroke->dashOffset != other->stroke->dashOffset ||
         stroke->visitedLinkPaintColor != other->stroke->visitedLinkPaintColor ||
         stroke->visitedLinkPaintUri != other->stroke->visitedLinkPaintUri ||
         stroke->visitedLinkPaintType != other->stroke->visitedLinkPaintType)
       return true;
   }
@@ skipping 36 matching lines @@
   // 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)
+          other->svg_inherited_flags.colorInterpolationFilters)
     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));
-  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;
-}
-
 }  // namespace blink