Revert of Make cc/paint have concrete types

third_party/WebKit/Source/platform/graphics/gpu/AcceleratedImageBufferSurface.cpp

Index: third_party/WebKit/Source/platform/graphics/gpu/AcceleratedImageBufferSurface.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/gpu/AcceleratedImageBufferSurface.cpp b/third_party/WebKit/Source/platform/graphics/gpu/AcceleratedImageBufferSurface.cpp
index 63f4ca581f0af61ac6a2efa209a58aeb11c133ad..78847f69dcdef6924ccf9c02bd5bc266a2ee61cc 100644
--- a/third_party/WebKit/Source/platform/graphics/gpu/AcceleratedImageBufferSurface.cpp
+++ b/third_party/WebKit/Source/platform/graphics/gpu/AcceleratedImageBufferSurface.cpp
@@ -56,18 +56,16 @@
   SkImageInfo info = SkImageInfo::Make(size.width(), size.height(), colorType,
                                        alphaType, colorSpace);
   SkSurfaceProps disableLCDProps(0, kUnknown_SkPixelGeometry);
-  m_surface = SkSurface::MakeRenderTarget(
+  m_surface = PaintSurface::MakeRenderTarget(
       grContext, SkBudgeted::kYes, info, 0 /* sampleCount */,
       Opaque == opacityMode ? nullptr : &disableLCDProps);
   if (!m_surface)
     return;
-
-  m_canvas = WTF::wrapUnique(new PaintCanvas(m_surface->getCanvas()));
   clear();
 
   // Always save an initial frame, to support resetting the top level matrix
   // and clip.
-  m_canvas->save();
+  m_surface->getCanvas()->save();
 }
 
 bool AcceleratedImageBufferSurface::isValid() const {
@@ -85,7 +83,7 @@
     return 0;
   return skia::GrBackendObjectToGrGLTextureInfo(
              m_surface->getTextureHandle(
-                 SkSurface::kDiscardWrite_TextureHandleAccess))
+                 PaintSurface::kDiscardWrite_TextureHandleAccess))
       ->fID;
 }