Rename paint data structures

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

 /*
  * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2007, 2008, 2009 Apple Inc. All rights reserved.
  * 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 17 matching lines @@
 #ifndef ImageBuffer_h
 #define ImageBuffer_h
 
 #include "platform/PlatformExport.h"
 #include "platform/geometry/FloatRect.h"
 #include "platform/geometry/IntSize.h"
 #include "platform/graphics/Canvas2DLayerBridge.h"
 #include "platform/graphics/GraphicsTypes.h"
 #include "platform/graphics/GraphicsTypes3D.h"
 #include "platform/graphics/ImageBufferSurface.h"
+#include "platform/graphics/paint/PaintFlags.h"
+#include "platform/graphics/paint/PaintRecord.h"
 #include "platform/transforms/AffineTransform.h"
-#include "third_party/skia/include/core/SkPaint.h"
-#include "third_party/skia/include/core/SkPicture.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
 #include "wtf/Forward.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/Vector.h"
 #include "wtf/text/WTFString.h"
 #include "wtf/typed_arrays/Uint8ClampedArray.h"
 #include <memory>
 
 namespace gpu {
 namespace gles2 {
@@ skipping 51 matching lines @@
     return m_snapshotState == DrawnToAfterSnapshot;
   }
 
   void setFilterQuality(SkFilterQuality filterQuality) {
     m_surface->setFilterQuality(filterQuality);
   }
   void setIsHidden(bool hidden) { m_surface->setIsHidden(hidden); }
 
   // Called by subclasses of ImageBufferSurface to install a new canvas object.
   // Virtual for mocking
-  virtual void resetCanvas(SkCanvas*) const;
+  virtual void resetCanvas(PaintCanvas*) const;
 
-  SkCanvas* canvas() const;
+  PaintCanvas* canvas() const;
   void disableDeferral(DisableDeferralReason) const;
 
   // Called at the end of a task that rendered a whole frame
   void finalizeFrame(const FloatRect& dirtyRect);
   void didFinalizeFrame();
 
   bool isDirty();
 
   bool writePixels(const SkImageInfo&,
                    const void* pixels,
@@ skipping 37 matching lines @@
   void flushGpu(FlushReason);  // Like flush(), but flushes all the way down to
                                // the GPU context if the surface is accelerated.
 
   void notifySurfaceInvalid();
 
   sk_sp<SkImage> newSkImageSnapshot(AccelerationHint, SnapshotReason) const;
   PassRefPtr<Image> newImageSnapshot(
       AccelerationHint = PreferNoAcceleration,
       SnapshotReason = SnapshotReasonUnknown) const;
 
-  sk_sp<SkPicture> getPicture() { return m_surface->getPicture(); }
+  sk_sp<PaintRecord> getPicture() { return m_surface->getPicture(); }
 
   void draw(GraphicsContext&, const FloatRect&, const FloatRect*, SkBlendMode);
 
   void updateGPUMemoryUsage() const;
   static intptr_t getGlobalGPUMemoryUsage() { return s_globalGPUMemoryUsage; }
   static unsigned getGlobalAcceleratedImageBufferCount() {
     return s_globalAcceleratedImageBufferCount;
   }
   intptr_t getGPUMemoryUsage() { return m_gpuMemoryUsage; }
 
@@ skipping 34 matching lines @@
   int height() const { return m_size.height(); }
   int width() const { return m_size.width(); }
 
   const unsigned char* m_data;
   const IntSize m_size;
 };
 
 }  // namespace blink
 
 #endif  // ImageBuffer_h