Remove two Gradient setters

setSpreadMethod() and setDrawsInPMColorSpace() are only ever called
immediately after instantiation, so they can be folded into ctor easily.

Refactor only, no functional changes.

BUG=614368
R=schenney@chromium.org,fs@opera.com

Review-Url: https://codereview.chromium.org/2754783003
Cr-Commit-Position: refs/heads/master@{#457473}

third_party/WebKit/Source/core/css/CSSGradientValue.cpp

@@ -878,10 +878,10 @@ PassRefPtr<Gradient> CSSLinearGradientValue::createGradient(
     }
   }
 
-  RefPtr<Gradient> gradient = Gradient::create(firstPoint, secondPoint);
-
-  gradient->setSpreadMethod(m_repeating ? SpreadMethodRepeat : SpreadMethodPad);
-  gradient->setDrawsInPMColorSpace(true);
+  RefPtr<Gradient> gradient =
+      Gradient::create(firstPoint, secondPoint,
+                       m_repeating ? SpreadMethodRepeat : SpreadMethodPad,
+                       Gradient::ColorInterpolation::Premultiplied);
 
   // Now add the stops.
   addStops(gradient.get(), conversionData, object);
@@ -1247,10 +1247,9 @@ PassRefPtr<Gradient> CSSRadialGradientValue::createGradient(
   RefPtr<Gradient> gradient =
       Gradient::create(firstPoint, firstRadius, secondPoint,
                        isDegenerate ? 0 : secondRadius.width(),
-                       isDegenerate ? 1 : secondRadius.aspectRatio());
-
-  gradient->setSpreadMethod(m_repeating ? SpreadMethodRepeat : SpreadMethodPad);
-  gradient->setDrawsInPMColorSpace(true);
+                       isDegenerate ? 1 : secondRadius.aspectRatio(),
+                       m_repeating ? SpreadMethodRepeat : SpreadMethodPad,
+                       Gradient::ColorInterpolation::Premultiplied);
 
   // Now add the stops.
   addStops(gradient.get(), conversionData, object);

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

@@ -52,10 +52,10 @@ FloatPoint LayoutSVGResourceLinearGradient::endPoint(
 
 PassRefPtr<Gradient> LayoutSVGResourceLinearGradient::buildGradient() const {
   const LinearGradientAttributes& attributes = this->attributes();
-  RefPtr<Gradient> gradient =
-      Gradient::create(startPoint(attributes), endPoint(attributes));
-  gradient->setSpreadMethod(
-      platformSpreadMethodFromSVGType(attributes.spreadMethod()));
+  RefPtr<Gradient> gradient = Gradient::create(
+      startPoint(attributes), endPoint(attributes),
+      platformSpreadMethodFromSVGType(attributes.spreadMethod()),
+      Gradient::ColorInterpolation::Unpremultiplied);
   gradient->addColorStops(attributes.stops());
   return gradient.release();
 }

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

@@ -65,11 +65,11 @@ float LayoutSVGResourceRadialGradient::focalRadius(
 
 PassRefPtr<Gradient> LayoutSVGResourceRadialGradient::buildGradient() const {
   const RadialGradientAttributes& attributes = this->attributes();
-  RefPtr<Gradient> gradient =
-      Gradient::create(focalPoint(attributes), focalRadius(attributes),
-                       centerPoint(attributes), radius(attributes));
-  gradient->setSpreadMethod(
-      platformSpreadMethodFromSVGType(attributes.spreadMethod()));
+  RefPtr<Gradient> gradient = Gradient::create(
+      focalPoint(attributes), focalRadius(attributes), centerPoint(attributes),
+      radius(attributes), 1,
+      platformSpreadMethodFromSVGType(attributes.spreadMethod()),
+      Gradient::ColorInterpolation::Unpremultiplied);
   gradient->addColorStops(attributes.stops());
   return gradient.release();
 }

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

@@ -42,7 +42,10 @@ typedef Vector<SkColor, 8> ColorStopColorVector;
 
 namespace blink {
 
-Gradient::Gradient(const FloatPoint& p0, const FloatPoint& p1)
+Gradient::Gradient(const FloatPoint& p0,
+                   const FloatPoint& p1,
+                   GradientSpreadMethod spreadMethod,
+                   ColorInterpolation interpolation)
     : m_p0(p0),
       m_p1(p1),
       m_r0(0),
@@ -50,14 +53,16 @@ Gradient::Gradient(const FloatPoint& p0, const FloatPoint& p1)
       m_aspectRatio(1),
       m_radial(false),
       m_stopsSorted(false),
-      m_drawInPMColorSpace(false),
-      m_spreadMethod(SpreadMethodPad) {}
+      m_spreadMethod(spreadMethod),
+      m_colorInterpolation(interpolation) {}
 
 Gradient::Gradient(const FloatPoint& p0,
                    float r0,
                    const FloatPoint& p1,
                    float r1,
-                   float aspectRatio)
+                   float aspectRatio,
+                   GradientSpreadMethod spreadMethod,
+                   ColorInterpolation interpolation)
     : m_p0(p0),
       m_p1(p1),
       m_r0(r0),
@@ -65,8 +70,8 @@ Gradient::Gradient(const FloatPoint& p0,
       m_aspectRatio(aspectRatio),
       m_radial(true),
       m_stopsSorted(false),
-      m_drawInPMColorSpace(false),
-      m_spreadMethod(SpreadMethodPad) {}
+      m_spreadMethod(spreadMethod),
+      m_colorInterpolation(interpolation) {}
 
 Gradient::~Gradient() {}
 
@@ -103,25 +108,6 @@ void Gradient::sortStopsIfNecessary() {
   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.
-  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_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,
@@ -208,9 +194,9 @@ sk_sp<PaintShader> Gradient::createShader(const SkMatrix& localMatrix) {
   }
 
   sk_sp<SkShader> shader;
-  uint32_t shouldDrawInPMColorSpace =
-      m_drawInPMColorSpace ? SkGradientShader::kInterpolateColorsInPremul_Flag
-                           : 0;
+  uint32_t flags = m_colorInterpolation == ColorInterpolation::Premultiplied
+                       ? SkGradientShader::kInterpolateColorsInPremul_Flag
+                       : 0;
   if (m_radial) {
     SkMatrix adjustedLocalMatrix = localMatrix;
 
@@ -228,8 +214,7 @@ sk_sp<PaintShader> Gradient::createShader(const SkMatrix& localMatrix) {
     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,
-          &adjustedLocalMatrix);
+          static_cast<int>(countUsed), tile, flags, &adjustedLocalMatrix);
     } else {
       // The radii we give to Skia must be positive. If we're given a
       // negative radius, ask for zero instead.
@@ -237,14 +222,13 @@ sk_sp<PaintShader> Gradient::createShader(const SkMatrix& localMatrix) {
       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,
-          &adjustedLocalMatrix);
+          static_cast<int>(countUsed), tile, flags, &adjustedLocalMatrix);
     }
   } else {
     SkPoint pts[2] = {m_p0.data(), m_p1.data()};
-    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,
+                                          flags, &localMatrix);
   }
 
   if (!shader) {

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

@@ -49,16 +49,28 @@ class PLATFORM_EXPORT Gradient : public RefCounted<Gradient> {
   WTF_MAKE_NONCOPYABLE(Gradient);
 
  public:
-  static PassRefPtr<Gradient> create(const FloatPoint& p0,
-                                     const FloatPoint& p1) {
-    return adoptRef(new Gradient(p0, p1));
+  enum class ColorInterpolation {
+    Premultiplied,
+    Unpremultiplied,
+  };
+
+  static PassRefPtr<Gradient> create(
+      const FloatPoint& p0,
+      const FloatPoint& p1,
+      GradientSpreadMethod spreadMethod = SpreadMethodPad,
+      ColorInterpolation interpolation = ColorInterpolation::Unpremultiplied) {
+    return adoptRef(new Gradient(p0, p1, spreadMethod, interpolation));
   }
-  static PassRefPtr<Gradient> create(const FloatPoint& p0,
-                                     float r0,
-                                     const FloatPoint& p1,
-                                     float r1,
-                                     float aspectRatio = 1) {
-    return adoptRef(new Gradient(p0, r0, p1, r1, aspectRatio));
+  static PassRefPtr<Gradient> create(
+      const FloatPoint& p0,
+      float r0,
+      const FloatPoint& p1,
+      float r1,
+      float aspectRatio = 1,
+      GradientSpreadMethod spreadMethod = SpreadMethodPad,
+      ColorInterpolation interpolation = ColorInterpolation::Unpremultiplied) {
+    return adoptRef(
+        new Gradient(p0, r0, p1, r1, aspectRatio, spreadMethod, interpolation));
   }
   ~Gradient();
 
@@ -117,18 +129,20 @@ class PLATFORM_EXPORT Gradient : public RefCounted<Gradient> {
 
   void applyToFlags(PaintFlags&, const SkMatrix& localMatrix);
 
-  void setDrawsInPMColorSpace(bool drawInPMColorSpace);
-
-  void setSpreadMethod(GradientSpreadMethod);
   GradientSpreadMethod spreadMethod() const { return m_spreadMethod; }
 
  private:
-  Gradient(const FloatPoint& p0, const FloatPoint& p1);
+  Gradient(const FloatPoint& p0,
+           const FloatPoint& p1,
+           GradientSpreadMethod,
+           ColorInterpolation);
   Gradient(const FloatPoint& p0,
            float r0,
            const FloatPoint& p1,
            float r1,
-           float aspectRatio);
+           float aspectRatio,
+           GradientSpreadMethod,
+           ColorInterpolation);
 
   sk_sp<PaintShader> createShader(const SkMatrix& localMatrix);
 
@@ -142,8 +156,8 @@ class PLATFORM_EXPORT Gradient : public RefCounted<Gradient> {
   Vector<ColorStop, 2> m_stops;
   bool m_radial;
   bool m_stopsSorted;
-  bool m_drawInPMColorSpace;
   GradientSpreadMethod m_spreadMethod;
+  ColorInterpolation m_colorInterpolation;
 
   mutable sk_sp<PaintShader> m_cachedShader;
 };