Rename paint data structures

third_party/WebKit/Source/platform/graphics/PlaceholderImage.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "platform/graphics/PlaceholderImage.h"
 
 #include "platform/geometry/FloatRect.h"
 #include "platform/graphics/Color.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/ImageObserver.h"
+#include "platform/graphics/paint/PaintRecord.h"
 #include "platform/graphics/paint/SkPictureBuilder.h"
-#include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
-#include "third_party/skia/include/core/SkPaint.h"
-#include "third_party/skia/include/core/SkPicture.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "third_party/skia/include/core/SkSize.h"
 
 namespace blink {
 
 namespace {
 
 // Gray with 40% opacity.
 const RGBA32 kFillColor = 0x66808080;
 
@@ skipping 11 matching lines @@
   const FloatRect destRect(0.0f, 0.0f, static_cast<float>(m_size.width()),
                            static_cast<float>(m_size.height()));
   SkPictureBuilder builder(destRect);
   GraphicsContext& context = builder.context();
   context.beginRecording(destRect);
 
   context.setFillColor(kFillColor);
   context.fillRect(destRect);
 
   m_imageForCurrentFrame = SkImage::MakeFromPicture(
-      builder.endRecording(), SkISize::Make(m_size.width(), m_size.height()),
-      nullptr, nullptr);
+      ToSkPicture(builder.endRecording()),
+      SkISize::Make(m_size.width(), m_size.height()), nullptr, nullptr);
 
   return m_imageForCurrentFrame;
 }
 
-void PlaceholderImage::draw(SkCanvas* canvas,
-                            const SkPaint& basePaint,
+void PlaceholderImage::draw(PaintCanvas* canvas,
+                            const PaintFlags& basePaint,
                             const FloatRect& destRect,
                             const FloatRect& srcRect,
                             RespectImageOrientationEnum,
                             ImageClampingMode,
                             const ColorBehavior& colorBehavior) {
   // TODO(ccameron): This function should not ignore |colorBehavior|.
   // https://crbug.com/672306
   if (!srcRect.intersects(FloatRect(0.0f, 0.0f,
                                     static_cast<float>(m_size.width()),
                                     static_cast<float>(m_size.height())))) {
     return;
   }
 
-  SkPaint paint(basePaint);
-  paint.setStyle(SkPaint::kFill_Style);
+  PaintFlags paint(basePaint);
+  paint.setStyle(PaintFlags::kFill_Style);
   paint.setColor(kFillColor);
   canvas->drawRect(destRect, paint);
 }
 
 void PlaceholderImage::destroyDecodedData() {
   m_imageForCurrentFrame.reset();
 }
 
 }  // namespace blink