Retire setGradientSpaceTransform, setPatternSpaceTransform

third_party/WebKit/Source/core/layout/svg/LayoutSVGResourcePaintServer.cpp

 /*
  * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2007 Rob Buis <buis@kde.org>
  * Copyright (C) 2008 Dirk Schulze <krit@webkit.org>
  * 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 17 matching lines @@
 #include "platform/graphics/skia/SkiaUtils.h"
 #include "third_party/skia/include/core/SkPaint.h"
 
 namespace blink {
 
 SVGPaintServer::SVGPaintServer(Color color)
     : m_color(color)
 {
 }
 
-SVGPaintServer::SVGPaintServer(PassRefPtr<Gradient> gradient)
+SVGPaintServer::SVGPaintServer(PassRefPtr<Gradient> gradient, const AffineTransform& transform)
     : m_gradient(gradient)
+    , m_transform(transform)
     , m_color(Color::black)
 {
 }
 
-SVGPaintServer::SVGPaintServer(PassRefPtr<Pattern> pattern)
+SVGPaintServer::SVGPaintServer(PassRefPtr<Pattern> pattern, const AffineTransform& transform)
     : m_pattern(pattern)
+    , m_transform(transform)
     , m_color(Color::black)
 {
 }
 
 void SVGPaintServer::applyToSkPaint(SkPaint& paint, float paintAlpha)
 {
     SkColor baseColor = m_gradient || m_pattern ? SK_ColorBLACK : m_color.rgb();
     paint.setColor(scaleAlpha(baseColor, paintAlpha));
     if (m_pattern) {
-        m_pattern->applyToPaint(paint);
+        const SkMatrix localMatrix = affineTransformToSkMatrix(m_transform);
+        m_pattern->applyToPaint(paint, &localMatrix);
     } else if (m_gradient) {
-        m_gradient->applyToPaint(paint);
+        const SkMatrix localMatrix = affineTransformToSkMatrix(m_transform);
+        m_gradient->applyToPaint(paint, &localMatrix);
     } else {
         paint.setShader(nullptr);
     }
 }
 
 void SVGPaintServer::prependTransform(const AffineTransform& transform)
 {
     ASSERT(m_gradient || m_pattern);
-    if (m_pattern)
-        m_pattern->setPatternSpaceTransform(transform * m_pattern->patternSpaceTransform());
-    else
-        m_gradient->setGradientSpaceTransform(transform * m_gradient->gradientSpaceTransform());
+    m_transform = transform * m_transform;

[Stephen White, 2016/05/26 20:36:26]

Is there any danger that this function will be called more than once? The
previous version seemed like it would apply the same transform if called twice,
whereas this one will accumulate.

Maybe we should assert? Or perhaps it's just caveat caller?

[fs, 2016/05/26 21:35:43]

The semantics are unchanged, maybe easier to see if considering
fooSpaceTransform() as returning a mutable reference and writing as:

m_foo->fooSpaceTransform() = transform * m_foo->fooSpaceTransform();

There's only one callsite still though (and none more planned for atm; with this
simplification maybe we can do away with it entirely instead.)

[Stephen White, 2016/05/26 21:38:28]

You're right; it's the same as before. Ignore my comment.

 }
 
 static SVGPaintDescription requestPaint(const LayoutObject& object, const ComputedStyle& style, LayoutSVGResourceMode mode)
 {
     // If we have no style at all, ignore it.
     const SVGComputedStyle& svgStyle = style.svgStyle();
 
     // If we have no fill/stroke, return 0.
     if (mode == ApplyToFillMode) {
         if (!svgStyle.hasFill())
@@ skipping 95 matching lines @@
 LayoutSVGResourcePaintServer::~LayoutSVGResourcePaintServer()
 {
 }
 
 SVGPaintDescription LayoutSVGResourcePaintServer::requestPaintDescription(const LayoutObject& layoutObject, const ComputedStyle& style, LayoutSVGResourceMode resourceMode)
 {
     return requestPaint(layoutObject, style, resourceMode);
 }
 
 } // namespace blink