Rename paint data structures

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

 /*
  * Copyright (c) 2008, Google Inc. All rights reserved.
  * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
  * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. 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
@@ skipping 27 matching lines @@
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/graphics/ExpensiveCanvasHeuristicParameters.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/ImageBufferClient.h"
 #include "platform/graphics/RecordingImageBufferSurface.h"
 #include "platform/graphics/StaticBitmapImage.h"
 #include "platform/graphics/UnacceleratedImageBufferSurface.h"
 #include "platform/graphics/gpu/DrawingBuffer.h"
 #include "platform/graphics/gpu/Extensions3DUtil.h"
+#include "platform/graphics/paint/PaintRecord.h"
 #include "platform/graphics/skia/SkiaUtils.h"
 #include "platform/image-encoders/JPEGImageEncoder.h"
 #include "platform/image-encoders/PNGImageEncoder.h"
 #include "platform/image-encoders/WEBPImageEncoder.h"
 #include "platform/network/mime/MIMETypeRegistry.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebGraphicsContext3DProvider.h"
 #include "skia/ext/texture_handle.h"
-#include "third_party/skia/include/core/SkPicture.h"
 #include "third_party/skia/include/core/SkSwizzle.h"
 #include "third_party/skia/include/gpu/GrContext.h"
 #include "third_party/skia/include/gpu/gl/GrGLTypes.h"
 #include "wtf/CheckedNumeric.h"
 #include "wtf/MathExtras.h"
 #include "wtf/PtrUtil.h"
 #include "wtf/Vector.h"
 #include "wtf/text/Base64.h"
 #include "wtf/text/WTFString.h"
 #include "wtf/typed_arrays/ArrayBufferContents.h"
@@ skipping 48 matching lines @@
     return false;
   CheckedNumeric<int> area = size.width();
   area *= size.height();
   if (!area.IsValid() || area.ValueOrDie() > kMaxCanvasArea)
     return false;
   if (size.width() > kMaxSkiaDim || size.height() > kMaxSkiaDim)
     return false;
   return true;
 }
 
-SkCanvas* ImageBuffer::canvas() const {
+PaintCanvas* ImageBuffer::canvas() const {
   return m_surface->canvas();
 }
 
 void ImageBuffer::disableDeferral(DisableDeferralReason reason) const {
   return m_surface->disableDeferral(reason);
 }
 
 bool ImageBuffer::writePixels(const SkImageInfo& info,
                               const void* pixels,
                               size_t rowBytes,
@@ skipping 22 matching lines @@
 
 bool ImageBuffer::restoreSurface() const {
   return m_surface->isValid() || m_surface->restore();
 }
 
 void ImageBuffer::notifySurfaceInvalid() {
   if (m_client)
     m_client->notifySurfaceInvalid();
 }
 
-void ImageBuffer::resetCanvas(SkCanvas* canvas) const {
+void ImageBuffer::resetCanvas(PaintCanvas* canvas) const {
   if (m_client)
     m_client->restoreCanvasMatrixClipStack(canvas);
 }
 
 sk_sp<SkImage> ImageBuffer::newSkImageSnapshot(AccelerationHint hint,
                                                SnapshotReason reason) const {
   if (m_snapshotState == InitialSnapshotState)
     m_snapshotState = DidAcquireSnapshot;
 
   if (!isSurfaceValid())
@@ skipping 389 matching lines @@
   DCHECK(MIMETypeRegistry::isSupportedImageMIMETypeForEncoding(mimeType));
 
   Vector<unsigned char> result;
   if (!encodeImage(mimeType, quality, &result))
     return "data:,";
 
   return "data:" + mimeType + ";base64," + base64Encode(result);
 }
 
 }  // namespace blink