Retire setGradientSpaceTransform, setPatternSpaceTransform

third_party/WebKit/Source/platform/graphics/Gradient.h

 /*
  * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alp Toker <alp@atoker.com>
  * Copyright (C) 2008 Torch Mobile, Inc.
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
@@ skipping 15 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef Gradient_h
 #define Gradient_h
 
 #include "platform/PlatformExport.h"
 #include "platform/geometry/FloatPoint.h"
 #include "platform/graphics/Color.h"
 #include "platform/graphics/GraphicsTypes.h"
-#include "platform/transforms/AffineTransform.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
 #include "wtf/Noncopyable.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
 #include "wtf/Vector.h"
 
+class SkMatrix;
 class SkPaint;
 class SkShader;
 
 namespace blink {
 
 class PLATFORM_EXPORT Gradient : public RefCounted<Gradient> {
     WTF_MAKE_NONCOPYABLE(Gradient);
 public:
     static PassRefPtr<Gradient> create(const FloatPoint& p0, const FloatPoint& p1)
     {
@@ skipping 49 matching lines @@
     }
 
     void setEndRadius(float r)
     {
         if (m_r1 == r)
             return;
 
         m_r1 = r;
     }
 
-    float aspectRatio() const { return m_aspectRatio; }
-
-    void applyToPaint(SkPaint&);
+    void applyToPaint(SkPaint&, const SkMatrix* localMatrix = nullptr);
 
     void setDrawsInPMColorSpace(bool drawInPMColorSpace);
 
     void setSpreadMethod(GradientSpreadMethod);
     GradientSpreadMethod spreadMethod() const { return m_spreadMethod; }
-    void setGradientSpaceTransform(const AffineTransform& gradientSpaceTransformation);
-    AffineTransform gradientSpaceTransform() { return m_gradientSpaceTransformation; }
 
 private:
     Gradient(const FloatPoint& p0, const FloatPoint& p1);
     Gradient(const FloatPoint& p0, float r0, const FloatPoint& p1, float r1, float aspectRatio);
 
-    sk_sp<SkShader> createShader();
+    sk_sp<SkShader> createShader(const SkMatrix* localMatrix);

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

I'm be tempted to say, just make this a const SkMatrix&, and force callers to
pass identity if they don't want a transform. The callee does that anyway, so I
don't think there's a speed win from allowing a nullptr.

[f(malita), 2016/05/27 15:18:40]

Thanks, that actually gets rid of quite a bit of boilerplate (at the cost of
adding a handful of SkMatrix::MakeScale(1)s - wish SkMatrix had a MakeIdentity
or a global identity matrix, maybe we should add that).

Done.

 
     void sortStopsIfNecessary();
 
     FloatPoint m_p0;
     FloatPoint m_p1;
     float m_r0;
     float m_r1;
     float m_aspectRatio; // For elliptical gradient, width / height.
     Vector<ColorStop, 2> m_stops;
     bool m_radial;
     bool m_stopsSorted;
     bool m_drawInPMColorSpace;
     GradientSpreadMethod m_spreadMethod;
-    AffineTransform m_gradientSpaceTransformation;
 
-    sk_sp<SkShader> m_gradient;
+    mutable sk_sp<SkShader> m_cachedShader;
 };
 
 } // namespace blink
 
 #endif