Revert of Make cc/paint have concrete types

third_party/WebKit/Source/platform/graphics/UnacceleratedImageBufferSurface.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 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "platform/graphics/UnacceleratedImageBufferSurface.h"
 
 #include "platform/graphics/skia/SkiaUtils.h"
-#include "third_party/skia/include/core/SkSurface.h"
 #include "wtf/PassRefPtr.h"
 
 namespace blink {
 
 UnacceleratedImageBufferSurface::UnacceleratedImageBufferSurface(
     const IntSize& size,
     OpacityMode opacityMode,
     ImageInitializationMode initializationMode,
     sk_sp<SkColorSpace> colorSpace,
     SkColorType colorType)
     : ImageBufferSurface(size, opacityMode, colorSpace, colorType) {
   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::MakeRaster(info, Opaque == opacityMode ? 0 : &disableLCDProps);
-
-  if (!m_surface)
-    return;
+  m_surface = PaintSurface::MakeRaster(
+      info, Opaque == opacityMode ? 0 : &disableLCDProps);
 
   // Always save an initial frame, to support resetting the top level matrix
   // and clip.
-  m_canvas = WTF::wrapUnique(new PaintCanvas(m_surface->getCanvas()));
-  m_canvas->save();
+  if (m_surface)
+    m_surface->getCanvas()->save();
 
-  if (initializationMode == InitializeImagePixels)
-    clear();
+  if (initializationMode == InitializeImagePixels) {
+    if (m_surface)
+      clear();
+  }
 }
 
 UnacceleratedImageBufferSurface::~UnacceleratedImageBufferSurface() {}
 
 PaintCanvas* UnacceleratedImageBufferSurface::canvas() {
-  return m_canvas.get();
+  return m_surface->getCanvas();
 }
 
 bool UnacceleratedImageBufferSurface::isValid() const {
   return m_surface;
 }
 
 sk_sp<SkImage> UnacceleratedImageBufferSurface::newImageSnapshot(
     AccelerationHint,
     SnapshotReason) {
   return m_surface->makeImageSnapshot();
 }
 
 }  // namespace blink