Revert of Make cc/paint have concrete types

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

 /*
  * Copyright (c) 2013, 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 38 matching lines @@
     return;
   GrContext* grContext = SharedGpuContext::gr();
   m_contextId = SharedGpuContext::contextId();
   CHECK(grContext);
 
   SkAlphaType alphaType =
       (Opaque == opacityMode) ? kOpaque_SkAlphaType : kPremul_SkAlphaType;
   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 {
   return m_surface && SharedGpuContext::isValid() &&
          m_contextId == SharedGpuContext::contextId();
 }
 
 sk_sp<SkImage> AcceleratedImageBufferSurface::newImageSnapshot(AccelerationHint,
                                                                SnapshotReason) {
   return m_surface->makeImageSnapshot();
 }
 
 GLuint AcceleratedImageBufferSurface::getBackingTextureHandleForOverwrite() {
   if (!m_surface)
     return 0;
   return skia::GrBackendObjectToGrGLTextureInfo(
              m_surface->getTextureHandle(
-                 SkSurface::kDiscardWrite_TextureHandleAccess))
+                 PaintSurface::kDiscardWrite_TextureHandleAccess))
       ->fID;
 }
 
 }  // namespace blink