Rename paint data structures

third_party/WebKit/Source/platform/graphics/skia/SkiaUtils.cpp

 /*
  * Copyright (c) 2006,2007,2008, 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR 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/skia/SkiaUtils.h"
 
 #include "platform/graphics/GraphicsContext.h"
+#include "platform/graphics/paint/PaintFlags.h"
 #include "third_party/skia/include/effects/SkCornerPathEffect.h"
 
 namespace blink {
 
 static const struct CompositOpToXfermodeMode {
   CompositeOperator mCompositOp;
   SkBlendMode m_xfermodeMode;
 } gMapCompositOpsToXfermodeModes[] = {
     {CompositeClear, SkBlendMode::kClear},
     {CompositeCopy, SkBlendMode::kSrc},
@@ skipping 255 matching lines @@
   return scaleAlpha(color, clampedAlphaForBlending(alpha));
 }
 
 SkColor scaleAlpha(SkColor color, int alpha) {
   int a = (SkColorGetA(color) * alpha) >> 8;
   return (color & 0x00FFFFFF) | (a << 24);
 }
 
 template <typename PrimitiveType>
 void drawFocusRingPrimitive(const PrimitiveType&,
-                            SkCanvas*,
-                            const SkPaint&,
+                            PaintCanvas*,
+                            const PaintFlags&,
                             float cornerRadius) {
   ASSERT_NOT_REACHED();  // Missing an explicit specialization?
 }
 
 template <>
 void drawFocusRingPrimitive<SkRect>(const SkRect& rect,
-                                    SkCanvas* canvas,
-                                    const SkPaint& paint,
+                                    PaintCanvas* canvas,
+                                    const PaintFlags& paint,
                                     float cornerRadius) {
   SkRRect rrect;
   rrect.setRectXY(rect, SkFloatToScalar(cornerRadius),
                   SkFloatToScalar(cornerRadius));
   canvas->drawRRect(rrect, paint);
 }
 
 template <>
 void drawFocusRingPrimitive<SkPath>(const SkPath& path,
-                                    SkCanvas* canvas,
-                                    const SkPaint& paint,
+                                    PaintCanvas* canvas,
+                                    const PaintFlags& paint,
                                     float cornerRadius) {
-  SkPaint pathPaint = paint;
+  PaintFlags pathPaint = paint;
   pathPaint.setPathEffect(
       SkCornerPathEffect::Make(SkFloatToScalar(cornerRadius)));
   canvas->drawPath(path, pathPaint);
 }
 
 template <typename PrimitiveType>
 void drawPlatformFocusRing(const PrimitiveType& primitive,
-                           SkCanvas* canvas,
+                           PaintCanvas* canvas,
                            SkColor color,
                            float width) {
-  SkPaint paint;
+  PaintFlags paint;
   paint.setAntiAlias(true);
-  paint.setStyle(SkPaint::kStroke_Style);
+  paint.setStyle(PaintFlags::kStroke_Style);
   paint.setColor(color);
   paint.setStrokeWidth(width);
 
 #if OS(MACOSX)
   paint.setAlpha(64);
   const float cornerRadius = (width - 1) * 0.5f;
 #else
   const float cornerRadius = width;
 #endif
 
   drawFocusRingPrimitive(primitive, canvas, paint, cornerRadius);
 
 #if OS(MACOSX)
   // Inner part
   paint.setAlpha(128);
   paint.setStrokeWidth(paint.getStrokeWidth() * 0.5f);
   drawFocusRingPrimitive(primitive, canvas, paint, cornerRadius);
 #endif
 }
 
 template void PLATFORM_EXPORT drawPlatformFocusRing<SkRect>(const SkRect&,
-                                                            SkCanvas*,
+                                                            PaintCanvas*,
                                                             SkColor,
                                                             float width);
 template void PLATFORM_EXPORT drawPlatformFocusRing<SkPath>(const SkPath&,
-                                                            SkCanvas*,
+                                                            PaintCanvas*,
                                                             SkColor,
                                                             float width);
 
 }  // namespace blink