Maintain SkPaint in GraphicsContextState.

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 21 matching lines @@
 #include "platform/graphics/Color.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/skia/SkiaUtils.h"
 #include "third_party/skia/include/core/SkColorShader.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 
 namespace WebCore {
 
 Gradient::Gradient(const FloatPoint& p0, const FloatPoint& p1)
-    : m_radial(false)
-    , m_p0(p0)
+    : m_p0(p0)
     , m_p1(p1)
     , m_r0(0)
     , m_r1(0)
     , m_aspectRatio(1)
+    , m_radial(false)
     , m_stopsSorted(false)
+    , m_shaderChanged(false)
     , m_spreadMethod(SpreadMethodPad)
     , m_drawInPMColorSpace(false)
 {
 }
 
 Gradient::Gradient(const FloatPoint& p0, float r0, const FloatPoint& p1, float r1, float aspectRatio)
-    : m_radial(true)
-    , m_p0(p0)
+    : m_p0(p0)
     , m_p1(p1)
     , m_r0(r0)
     , m_r1(r1)
     , m_aspectRatio(aspectRatio)
+    , m_radial(true)
     , m_stopsSorted(false)
+    , m_shaderChanged(false)
     , m_spreadMethod(SpreadMethodPad)
     , m_drawInPMColorSpace(false)
 {
 }
 
 Gradient::~Gradient()
 {
 }
 
 void Gradient::addColorStop(float value, const Color& color)
 {
     float r;
     float g;
     float b;
     float a;
     color.getRGBA(r, g, b, a);
     m_stops.append(ColorStop(value, r, g, b, a));
 
     m_stopsSorted = false;
+    m_shaderChanged = true;
     m_gradient.clear();
 }
 
 void Gradient::addColorStop(const Gradient::ColorStop& stop)
 {
     m_stops.append(stop);
 
     m_stopsSorted = false;
+    m_shaderChanged = true;
     m_gradient.clear();
 }
 
 static inline bool compareStops(const Gradient::ColorStop& a, const Gradient::ColorStop& b)
 {
     return a.stop < b.stop;
 }
 
 void Gradient::sortStopsIfNecessary()
 {
@@ skipping 28 matching lines @@
 
     m_spreadMethod = spreadMethod;
 }
 
 void Gradient::setDrawsInPMColorSpace(bool drawInPMColorSpace)
 {
     if (drawInPMColorSpace == m_drawInPMColorSpace)
         return;
 
     m_drawInPMColorSpace = drawInPMColorSpace;
+    m_shaderChanged = true;
     m_gradient.clear();
 }
 
 void Gradient::setGradientSpaceTransform(const AffineTransform& gradientSpaceTransformation)
 {
     if (m_gradientSpaceTransformation == gradientSpaceTransformation)
         return;
 
     m_gradientSpaceTransformation = gradientSpaceTransformation;
     if (m_gradient)
@@ skipping 122 matching lines @@
         SkPoint pts[2] = { m_p0, m_p1 };
         m_gradient = adoptRef(SkGradientShader::CreateLinear(pts, colors, pos, static_cast<int>(countUsed), tile, 0, shouldDrawInPMColorSpace));
     }
 
     if (!m_gradient) {
         // use last color, since our "geometry" was degenerate (e.g. radius==0)
         m_gradient = adoptRef(new SkColorShader(colors[countUsed - 1]));
     } else {
         m_gradient->setLocalMatrix(affineTransformToSkMatrix(m_gradientSpaceTransformation));
     }
+    m_shaderChanged = true;
     return m_gradient.get();
 }
 
 } //namespace