Rename paint data structures

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

Index: third_party/WebKit/Source/platform/graphics/UnacceleratedImageBufferSurface.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/UnacceleratedImageBufferSurface.cpp b/third_party/WebKit/Source/platform/graphics/UnacceleratedImageBufferSurface.cpp
index d4b245403cb3186dd02bb87ab8e624b3e2b36b9d..72474a405f2dd510f2679bf1ea95c4cbc1086383 100644
--- a/third_party/WebKit/Source/platform/graphics/UnacceleratedImageBufferSurface.cpp
+++ b/third_party/WebKit/Source/platform/graphics/UnacceleratedImageBufferSurface.cpp
@@ -31,11 +31,8 @@
 #include "platform/graphics/UnacceleratedImageBufferSurface.h"
 
 #include "platform/graphics/skia/SkiaUtils.h"
-#include "third_party/skia/include/core/SkSurface.h"
 #include "wtf/PassRefPtr.h"
 
-class SkCanvas;
-
 namespace blink {
 
 UnacceleratedImageBufferSurface::UnacceleratedImageBufferSurface(
@@ -50,8 +47,8 @@ UnacceleratedImageBufferSurface::UnacceleratedImageBufferSurface(
   SkImageInfo info = SkImageInfo::Make(size.width(), size.height(), colorType,
                                        alphaType, colorSpace);
   SkSurfaceProps disableLCDProps(0, kUnknown_SkPixelGeometry);
-  m_surface =
-      SkSurface::MakeRaster(info, Opaque == opacityMode ? 0 : &disableLCDProps);
+  m_surface = PaintSurface::MakeRaster(
+      info, Opaque == opacityMode ? 0 : &disableLCDProps);
 
   // Always save an initial frame, to support resetting the top level matrix
   // and clip.
@@ -66,7 +63,7 @@ UnacceleratedImageBufferSurface::UnacceleratedImageBufferSurface(
 
 UnacceleratedImageBufferSurface::~UnacceleratedImageBufferSurface() {}
 
-SkCanvas* UnacceleratedImageBufferSurface::canvas() {
+PaintCanvas* UnacceleratedImageBufferSurface::canvas() {
   return m_surface->getCanvas();
 }