Rename paint data structures

third_party/WebKit/Source/core/layout/shapes/Shape.cpp

 /*
  * Copyright (C) 2012 Adobe Systems Incorporated. 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 25 matching lines @@
 #include "core/layout/shapes/PolygonShape.h"
 #include "core/layout/shapes/RasterShape.h"
 #include "core/layout/shapes/RectangleShape.h"
 #include "core/style/ComputedStyle.h"
 #include "core/svg/graphics/SVGImage.h"
 #include "platform/LengthFunctions.h"
 #include "platform/geometry/FloatRoundedRect.h"
 #include "platform/geometry/FloatSize.h"
 #include "platform/graphics/GraphicsTypes.h"
 #include "platform/graphics/ImageBuffer.h"
+#include "platform/graphics/paint/PaintFlags.h"
 #include "wtf/MathExtras.h"
 #include "wtf/PtrUtil.h"
 #include "wtf/typed_arrays/ArrayBufferContents.h"
 #include <memory>
 
 namespace blink {
 
 static std::unique_ptr<Shape> createInsetShape(const FloatRoundedRect& bounds) {
   ASSERT(bounds.rect().width() >= 0 && bounds.rect().height() >= 0);
   return WTF::makeUnique<BoxShape>(bounds);
@@ skipping 176 matching lines @@
   std::unique_ptr<RasterShapeIntervals> intervals = WTF::wrapUnique(
       new RasterShapeIntervals(marginRect.height(), -marginRect.y()));
   std::unique_ptr<ImageBuffer> imageBuffer =
       ImageBuffer::create(imageRect.size());
 
   if (image && imageBuffer) {
     // FIXME: This is not totally correct but it is needed to prevent shapes
     // that loads SVG Images during paint invalidations to mark layoutObjects
     // for layout, which is not allowed. See https://crbug.com/429346
     ImageObserverDisabler disabler(image);
-    SkPaint paint;
+    PaintFlags paint;
     IntRect imageSourceRect(IntPoint(), image->size());
     IntRect imageDestRect(IntPoint(), imageRect.size());
     // TODO(ccameron): No color conversion is required here.
     image->draw(imageBuffer->canvas(), paint, imageDestRect, imageSourceRect,
                 DoNotRespectImageOrientation,
                 Image::DoNotClampImageToSourceRect,
                 ColorBehavior::transformToGlobalTarget());
 
     WTF::ArrayBufferContents contents;
     imageBuffer->getImageData(Unmultiplied,
@@ skipping 44 matching lines @@
   FloatRect rect(0, 0, roundedRect.rect().width(), roundedRect.rect().height());
   FloatRoundedRect bounds(rect, roundedRect.getRadii());
   std::unique_ptr<Shape> shape = createInsetShape(bounds);
   shape->m_writingMode = writingMode;
   shape->m_margin = margin;
 
   return shape;
 }
 
 }  // namespace blink