Move SVG container paint code to SVGContainerPainter

Source/core/rendering/svg/RenderSVGResourceMarker.cpp

 /*
  * Copyright (C) 2004, 2005, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Rob Buis <buis@kde.org>
  * Copyright (C) Research In Motion Limited 2009-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 52 matching lines @@
 {
     markAllClientsForInvalidation(markForInvalidation ? LayoutAndBoundariesInvalidation : ParentOnlyInvalidation);
 }
 
 void RenderSVGResourceMarker::removeClientFromCache(RenderObject* client, bool markForInvalidation)
 {
     ASSERT(client);
     markClientForInvalidation(client, markForInvalidation ? BoundariesInvalidation : ParentOnlyInvalidation);
 }
 
-void RenderSVGResourceMarker::applyViewportClip(PaintInfo& paintInfo)
-{
-    if (SVGRenderSupport::isOverflowHidden(this))
-        paintInfo.context->clip(m_viewport);
-}
-
 FloatRect RenderSVGResourceMarker::markerBoundaries(const AffineTransform& markerTransformation) const
 {
     FloatRect coordinates = RenderSVGContainer::paintInvalidationRectInLocalCoordinates();
 
     // Map paint invalidation rect into parent coordinate space, in which the marker boundaries have to be evaluated
     coordinates = localToParentTransform().mapRect(coordinates);
 
     return markerTransformation.mapRect(coordinates);
 }
 
@@ skipping 50 matching lines @@
     ASSERT(marker);
     if (marker->hasAttribute(SVGNames::viewBoxAttr) && marker->viewBox()->currentValue()->isValid() && marker->viewBox()->currentValue()->value().isEmpty())
         return;
 
     PaintInfo info(paintInfo);
     GraphicsContextStateSaver stateSaver(*info.context, false);
     if (!transform.isIdentity()) {
         stateSaver.save();
         info.applyTransform(transform, false);
     }
+
+    if (SVGRenderSupport::isOverflowHidden(this))
+        info.context->clip(m_viewport);

[fs, 2014/09/25 11:00:45]

If transform.isIdentity(), this clip could now "leak" AFAICS.

[pdr., 2014/10/08 20:45:31]

Previously this code has an isIndentity check a couple of lines above but that's
been refactored away. I think the updated patch will be clean, but please
double-check in case I've misunderstood.

[fs, 2014/10/09 07:02:03]

The isIdentity-check just moved into PaintInfo::applyTransform, so I think this
still needs a "info.saveIfNeeded()" before it. (Arguably this case - isIdentity
- will not be very common, so dropping the ", false" from the stateSaver would
probably be good enough too.)

+
     RenderSVGContainer::paint(info, IntPoint());
 }
 
 AffineTransform RenderSVGResourceMarker::markerContentTransformation(const AffineTransform& contentTransformation, const FloatPoint& origin, float strokeWidth) const
 {
     // The 'origin' coordinate maps to SVGs refX/refY, given in coordinates relative to the viewport established by the marker
     FloatPoint mappedOrigin = viewportTransform().mapPoint(origin);
 
     AffineTransform transformation = contentTransformation;
     if (strokeWidth != -1)
@@ skipping 19 matching lines @@
     SVGMarkerElement* marker = toSVGMarkerElement(element());
     ASSERT(marker);
 
     SVGLengthContext lengthContext(marker);
     float w = marker->markerWidth()->currentValue()->value(lengthContext);
     float h = marker->markerHeight()->currentValue()->value(lengthContext);
     m_viewport = FloatRect(0, 0, w, h);
 }
 
 }