Rename paint data structures

third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DState.cpp

Index: third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DState.cpp
diff --git a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DState.cpp b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DState.cpp
index 98c248c184bf90f8ef1733e6bb80347e2a4492b3..8aa9281f779dbf3196e5f87bda7a8cb0436e9f51 100644
--- a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DState.cpp
+++ b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DState.cpp
@@ -20,6 +20,8 @@
 #include "platform/graphics/DrawLooperBuilder.h"
 #include "platform/graphics/filters/FilterEffect.h"
 #include "platform/graphics/filters/SkiaImageFilterBuilder.h"
+#include "platform/graphics/paint/PaintCanvas.h"
+#include "platform/graphics/paint/PaintFlags.h"
 #include "platform/graphics/skia/SkiaUtils.h"
 #include "third_party/skia/include/effects/SkDashPathEffect.h"
 #include "third_party/skia/include/effects/SkDropShadowImageFilter.h"
@@ -51,15 +53,15 @@ CanvasRenderingContext2DState::CanvasRenderingContext2DState()
       m_strokeStyleDirty(true),
       m_lineDashDirty(false),
       m_imageSmoothingQuality(kLow_SkFilterQuality) {
-  m_fillPaint.setStyle(SkPaint::kFill_Style);
+  m_fillPaint.setStyle(PaintFlags::kFill_Style);
   m_fillPaint.setAntiAlias(true);
-  m_imagePaint.setStyle(SkPaint::kFill_Style);
+  m_imagePaint.setStyle(PaintFlags::kFill_Style);
   m_imagePaint.setAntiAlias(true);
-  m_strokePaint.setStyle(SkPaint::kStroke_Style);
+  m_strokePaint.setStyle(PaintFlags::kStroke_Style);
   m_strokePaint.setStrokeWidth(1);
-  m_strokePaint.setStrokeCap(SkPaint::kButt_Cap);
+  m_strokePaint.setStrokeCap(PaintFlags::kButt_Cap);
   m_strokePaint.setStrokeMiter(10);
-  m_strokePaint.setStrokeJoin(SkPaint::kMiter_Join);
+  m_strokePaint.setStrokeJoin(PaintFlags::kMiter_Join);
   m_strokePaint.setAntiAlias(true);
   setImageSmoothingEnabled(true);
 }
@@ -336,10 +338,10 @@ sk_sp<SkImageFilter> CanvasRenderingContext2DState::getFilter(
 
     // We can't reuse m_fillPaint and m_strokePaint for the filter, since these
     // incorporate the global alpha, which isn't applicable here.
-    SkPaint fillPaintForFilter;
+    PaintFlags fillPaintForFilter;
     m_fillStyle->applyToPaint(fillPaintForFilter);
     fillPaintForFilter.setColor(m_fillStyle->paintColor());
-    SkPaint strokePaintForFilter;
+    PaintFlags strokePaintForFilter;
     m_strokeStyle->applyToPaint(strokePaintForFilter);
     strokePaintForFilter.setColor(m_strokeStyle->paintColor());
 
@@ -537,11 +539,11 @@ bool CanvasRenderingContext2DState::shouldDrawShadows() const {
          (m_shadowBlur || !m_shadowOffset.isZero());
 }
 
-const SkPaint* CanvasRenderingContext2DState::getPaint(
+const PaintFlags* CanvasRenderingContext2DState::getPaint(
     PaintType paintType,
     ShadowMode shadowMode,
     ImageType imageType) const {
-  SkPaint* paint;
+  PaintFlags* paint;
   switch (paintType) {
     case StrokePaintType:
       updateLineDash();