Move SVG shape painting code to SVGShapePainter

Source/core/rendering/svg/RenderSVGShape.h

 /*
  * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org>
  * Copyright (C) 2005 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2006 Apple Computer, Inc
  * Copyright (C) 2009 Google, Inc.
  * Copyright (C) 2011 Renata Hodovan <reni@webkit.org>
  * Copyright (C) 2011 University of Szeged
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 18 matching lines @@
 #include "core/rendering/svg/RenderSVGModelObject.h"
 #include "core/rendering/svg/SVGMarkerData.h"
 #include "platform/geometry/FloatRect.h"
 #include "platform/transforms/AffineTransform.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/Vector.h"
 
 namespace blink {
 
 class FloatPoint;
-class GraphicsContextStateSaver;
 class PointerEventsHitRules;
 class SVGGraphicsElement;
 
 class RenderSVGShape : public RenderSVGModelObject {
 public:
     explicit RenderSVGShape(SVGGraphicsElement*);
     virtual ~RenderSVGShape();
 
     void setNeedsShapeUpdate() { m_needsShapeUpdate = true; }
     virtual void setNeedsBoundariesUpdate() override final { m_needsBoundariesUpdate = true; }
     virtual void setNeedsTransformUpdate() override final { m_needsTransformUpdate = true; }
-    virtual void fillShape(GraphicsContext*) const;
-    virtual void strokeShape(GraphicsContext*) const;
 
     bool nodeAtFloatPointInternal(const HitTestRequest&, const FloatPoint&, PointerEventsHitRules);
 
     Path& path() const
     {
         ASSERT(m_path);
         return *m_path;
     }
+    bool hasPath() const { return m_path.get(); }
 
     virtual bool isShapeEmpty() const { return path().isEmpty(); }
 
+    virtual FloatRect paintInvalidationRectInLocalCoordinates() const override final { return m_paintInvalidationBoundingBox; }

[chrishtr, 2014/10/27 03:34:11]

Can this one be un-virtualized?

[chrishtr, 2014/10/27 03:34:12]

Can this one be un-virtualized?

[fs, 2014/10/27 12:36:27]

Not quite yet I think (still a few places calling this through RenderObject.)
Given the 'final' it ought to be devirtualized in the context of paint/ though.

+
+    bool hasNonScalingStroke() const { return style()->svgStyle().vectorEffect() == VE_NON_SCALING_STROKE; }
+    Path* nonScalingStrokePath(const Path*, const AffineTransform&) const;
+    AffineTransform nonScalingStrokeTransform() const;
+    virtual AffineTransform localTransform() const override final { return m_localTransform; }
+
+    virtual const Vector<MarkerPosition>* markerPositions() const { return 0; }
+
+    float strokeWidth() const;
+
+    virtual bool useRectRenderingFastPath() const { return false; }
+    virtual bool useEllipseRenderingFastPath() const { return false; }

[fs, 2014/10/27 12:36:27]

Why two extension points for this? They'll be mutually exclusive after all, so
something like:

enum GeometryCodePath {
  ...
};

virtual GeometryCodePath geometryCodePath() const { return ...; }

might do as well. (To go entirely crazy, that could just be stored in the
bitfield.)

[pdr., 2014/10/27 22:29:43]

Good idea, done.

+    virtual const Vector<FloatPoint>* zeroLengthLineCaps() const { return 0; };

[fs, 2014/10/27 12:36:27]

Nit: Redundant ';'.

[pdr., 2014/10/27 22:29:43]

Done.

+
+    virtual FloatRect objectBoundingBox() const override final { return m_fillBoundingBox; }
+
 protected:
     virtual void updateShapeFromElement();
     virtual bool shapeDependentStrokeContains(const FloatPoint&);
     virtual bool shapeDependentFillContains(const FloatPoint&, const WindRule) const;
-    float strokeWidth() const;
-    bool hasPath() const { return m_path.get(); }
     bool hasSmoothStroke() const;
 
-    bool hasNonScalingStroke() const { return style()->svgStyle().vectorEffect() == VE_NON_SCALING_STROKE; }
-    AffineTransform nonScalingStrokeTransform() const;
-    Path* nonScalingStrokePath(const Path*, const AffineTransform&) const;
+    // Give RenderSVGPath a hook for updating markers in updateShapeFromElement.
+    virtual void processMarkerPositions() { };

[fs, 2014/10/27 12:36:27]

Nit: Redundant ';'

 
     FloatRect m_fillBoundingBox;
     FloatRect m_strokeBoundingBox;
 
 private:
     // Hit-detection separated for the fill and the stroke
     bool fillContains(const FloatPoint&, bool requiresFill = true, const WindRule fillRule = RULE_NONZERO);
     bool strokeContains(const FloatPoint&, bool requiresStroke = true);
 
-    virtual FloatRect paintInvalidationRectInLocalCoordinates() const override final { return m_paintInvalidationBoundingBox; }
     virtual const AffineTransform& localToParentTransform() const override final { return m_localTransform; }
-    virtual AffineTransform localTransform() const override final { return m_localTransform; }
 
     virtual bool isOfType(RenderObjectType type) const override { return type == RenderObjectSVGShape || RenderSVGModelObject::isOfType(type); }
     virtual const char* renderName() const override { return "RenderSVGShape"; }
 
     virtual void layout() override final;
     virtual void paint(PaintInfo&, const LayoutPoint&) override final;
     virtual void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer) const override final;
 
     virtual bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const FloatPoint& pointInParent, HitTestAction) override final;
 
-    virtual FloatRect objectBoundingBox() const override final { return m_fillBoundingBox; }
     virtual FloatRect strokeBoundingBox() const override final { return m_strokeBoundingBox; }
     FloatRect calculateObjectBoundingBox() const;
     FloatRect calculateStrokeBoundingBox() const;
     void updatePaintInvalidationBoundingBox();
 
-    bool setupNonScalingStrokeContext(AffineTransform&, GraphicsContextStateSaver&);
-
-    bool shouldGenerateMarkerPositions() const;
-    FloatRect markerRect(float strokeWidth) const;
-    void processMarkerPositions();
-
-    void paintMarkers(PaintInfo&);
-
 private:
     FloatRect m_paintInvalidationBoundingBox;
     AffineTransform m_localTransform;
     OwnPtr<Path> m_path;
-    Vector<MarkerPosition> m_markerPositions;
 
     bool m_needsBoundariesUpdate : 1;
     bool m_needsShapeUpdate : 1;
     bool m_needsTransformUpdate : 1;
 };
 
 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderSVGShape, isSVGShape());
 
 }
 
 #endif