Rename paint data structures

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 11 matching lines @@
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (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/paint/PaintShader.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;
 
@@ skipping 127 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(const SkMatrix& localMatrix) {
+sk_sp<PaintShader> 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);
@@ skipping 49 matching lines @@
     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;
+  return WrapSkShader(shader);
 }
 
-void Gradient::applyToPaint(SkPaint& paint, const SkMatrix& localMatrix) {
+void Gradient::applyToPaint(PaintFlags& paint, const SkMatrix& localMatrix) {
   if (!m_cachedShader || localMatrix != m_cachedShader->getLocalMatrix())
     m_cachedShader = createShader(localMatrix);
 
   paint.setShader(m_cachedShader);
 
   // Legacy behavior: gradients are always dithered.
   paint.setDither(true);
 }
 
 }  // namespace blink