Retire setGradientSpaceTransform, setPatternSpaceTransform

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

 /*
  * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alp Toker <alp@atoker.com>
  * 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
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 13 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "platform/graphics/Gradient.h"
 
 #include "platform/geometry/FloatRect.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/skia/SkiaUtils.h"
 #include "third_party/skia/include/core/SkColor.h"
+#include "third_party/skia/include/core/SkMatrix.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include <algorithm>
 
 typedef Vector<SkScalar, 8> ColorStopOffsetVector;
 typedef Vector<SkColor, 8> ColorStopColorVector;
 
 namespace blink {
 
 Gradient::Gradient(const FloatPoint& p0, const FloatPoint& p1)
@@ skipping 33 matching lines @@
 
 void Gradient::addColorStop(const Gradient::ColorStop& stop)
 {
     if (m_stops.isEmpty()) {
         m_stopsSorted = true;
     } else {
         m_stopsSorted = m_stopsSorted && compareStops(m_stops.last(), stop);
     }
 
     m_stops.append(stop);
-    m_gradient.reset();
+    m_cachedShader.reset();
 }
 
 void Gradient::sortStopsIfNecessary()
 {
     if (m_stopsSorted)
         return;
 
     m_stopsSorted = true;
 
     if (!m_stops.size())
         return;
 
     std::stable_sort(m_stops.begin(), m_stops.end(), compareStops);
 }
 
 void Gradient::setSpreadMethod(GradientSpreadMethod spreadMethod)
 {
     // FIXME: Should it become necessary, allow calls to this method after m_gradient has been set.
-    ASSERT(!m_gradient);
+    DCHECK(!m_cachedShader);
 
     if (m_spreadMethod == spreadMethod)
         return;
 
     m_spreadMethod = spreadMethod;
 }
 
 void Gradient::setDrawsInPMColorSpace(bool drawInPMColorSpace)
 {
     if (drawInPMColorSpace == m_drawInPMColorSpace)
         return;
 
     m_drawInPMColorSpace = drawInPMColorSpace;
-    m_gradient.reset();
-}
-
-void Gradient::setGradientSpaceTransform(const AffineTransform& gradientSpaceTransformation)
-{
-    if (m_gradientSpaceTransformation == gradientSpaceTransformation)
-        return;
-
-    m_gradientSpaceTransformation = gradientSpaceTransformation;
-    m_gradient.reset();
+    m_cachedShader.reset();
 }
 
 // Determine the total number of stops needed, including pseudo-stops at the
 // ends as necessary.
 static size_t totalStopsNeeded(const Gradient::ColorStop* stopData, size_t count)
 {
     // N.B.: The tests in this function should kept in sync with the ones in
     // fillStops(), or badness happens.
     const Gradient::ColorStop* stop = stopData;
     size_t countUsed = count;
@@ skipping 42 matching lines @@
     }
 
     // Copy the last stop to 1.0 if needed. See comment above about this float
     // comparison.
     if (count < 1 || (--stop)->stop < 1.0) {
         pos[start + count] = WebCoreFloatToSkScalar(1.0);
         colors[start + count] = colors[start + count - 1];
     }
 }
 
-sk_sp<SkShader> Gradient::createShader()
+sk_sp<SkShader> Gradient::createShader(const SkMatrix& localMatrix)
 {
     sortStopsIfNecessary();
     ASSERT(m_stopsSorted);
 
     size_t countUsed = totalStopsNeeded(m_stops.data(), m_stops.size());
     ASSERT(countUsed >= 2);
     ASSERT(countUsed >= m_stops.size());
 
     ColorStopOffsetVector pos(countUsed);
     ColorStopColorVector colors(countUsed);
     fillStops(m_stops.data(), m_stops.size(), pos, colors);
 
     SkShader::TileMode tile = SkShader::kClamp_TileMode;
     switch (m_spreadMethod) {
     case SpreadMethodReflect:
         tile = SkShader::kMirror_TileMode;
         break;
     case SpreadMethodRepeat:
         tile = SkShader::kRepeat_TileMode;
         break;
     case SpreadMethodPad:
         tile = SkShader::kClamp_TileMode;
         break;
     }
 
     sk_sp<SkShader> shader;
     uint32_t shouldDrawInPMColorSpace = m_drawInPMColorSpace ? SkGradientShader::kInterpolateColorsInPremul_Flag : 0;
     if (m_radial) {
-        if (aspectRatio() != 1) {
+        SkMatrix adjustedLocalMatrix = localMatrix;
+
+        if (m_aspectRatio != 1) {
             // CSS3 elliptical gradients: apply the elliptical scaling at the
             // gradient center point.
-            m_gradientSpaceTransformation.translate(m_p0.x(), m_p0.y());
-            m_gradientSpaceTransformation.scale(1, 1 / aspectRatio());
-            m_gradientSpaceTransformation.translate(-m_p0.x(), -m_p0.y());
+            adjustedLocalMatrix.preTranslate(m_p0.x(), m_p0.y());
+            adjustedLocalMatrix.preScale(1, 1 / m_aspectRatio);
+            adjustedLocalMatrix.preTranslate(-m_p0.x(), -m_p0.y());
             ASSERT(m_p0 == m_p1);
         }
-        SkMatrix localMatrix = affineTransformToSkMatrix(m_gradientSpaceTransformation);
 
         // Since the two-point radial gradient is slower than the plain radial,
         // only use it if we have to.
         if (m_p0 == m_p1 && m_r0 <= 0.0f) {
-            shader = SkGradientShader::MakeRadial(m_p1.data(), m_r1, colors.data(), pos.data(), static_cast<int>(countUsed), tile, shouldDrawInPMColorSpace, &localMatrix);
+            shader = SkGradientShader::MakeRadial(m_p1.data(), m_r1, colors.data(), pos.data(),
+                static_cast<int>(countUsed), tile, shouldDrawInPMColorSpace, &adjustedLocalMatrix);
         } else {
             // The radii we give to Skia must be positive. If we're given a
             // negative radius, ask for zero instead.
             SkScalar radius0 = m_r0 >= 0.0f ? WebCoreFloatToSkScalar(m_r0) : 0;
             SkScalar radius1 = m_r1 >= 0.0f ? WebCoreFloatToSkScalar(m_r1) : 0;
-            shader = SkGradientShader::MakeTwoPointConical(m_p0.data(), radius0, m_p1.data(), radius1, colors.data(), pos.data(), static_cast<int>(countUsed), tile, shouldDrawInPMColorSpace, &localMatrix);
+            shader = SkGradientShader::MakeTwoPointConical(m_p0.data(), radius0, m_p1.data(),
+                radius1, colors.data(), pos.data(), static_cast<int>(countUsed), tile,
+                shouldDrawInPMColorSpace, &adjustedLocalMatrix);
         }
     } else {
         SkPoint pts[2] = { m_p0.data(), m_p1.data() };
-        SkMatrix localMatrix = affineTransformToSkMatrix(m_gradientSpaceTransformation);
-        shader = SkGradientShader::MakeLinear(pts, colors.data(), pos.data(), static_cast<int>(countUsed), tile, shouldDrawInPMColorSpace, &localMatrix);
+        shader = SkGradientShader::MakeLinear(pts, colors.data(), pos.data(),
+            static_cast<int>(countUsed), tile, shouldDrawInPMColorSpace, &localMatrix);
     }
 
     if (!shader) {
         // use last color, since our "geometry" was degenerate (e.g. radius==0)
         shader = SkShader::MakeColorShader(colors[countUsed - 1]);
     }
 
     return shader;
 }
 
-void Gradient::applyToPaint(SkPaint& paint)
+void Gradient::applyToPaint(SkPaint& paint, const SkMatrix& localMatrix)
 {
-    if (!m_gradient)
-        m_gradient = createShader();
+    if (!m_cachedShader || localMatrix != m_cachedShader->getLocalMatrix())
+        m_cachedShader = createShader(localMatrix);
 
-    paint.setShader(m_gradient);
+    paint.setShader(m_cachedShader);
 
     // Legacy behavior: gradients are always dithered.
     paint.setDither(true);
 }
 
 } // namespace blink