Rename paint data structures

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

 /*
  * Copyright (C) 2012 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 13 matching lines @@
  */
 
 #ifndef Canvas2DLayerBridge_h
 #define Canvas2DLayerBridge_h
 
 #include "cc/layers/texture_layer_client.h"
 #include "cc/resources/texture_mailbox.h"
 #include "platform/PlatformExport.h"
 #include "platform/geometry/IntSize.h"
 #include "platform/graphics/ImageBufferSurface.h"
+#include "platform/graphics/paint/PaintRecorder.h"
+#include "platform/graphics/paint/PaintSurface.h"
 #include "public/platform/WebExternalTextureLayer.h"
 #include "public/platform/WebThread.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
-#include "third_party/skia/include/core/SkSurface.h"
 #include "wtf/Allocator.h"
 #include "wtf/Deque.h"
 #include "wtf/RefCounted.h"
 #include "wtf/RefPtr.h"
 #include "wtf/Vector.h"
 #include "wtf/WeakPtr.h"
 #include <memory>
 
 class SkImage;
 struct SkImageInfo;
-class SkPictureRecorder;
 
 namespace gpu {
 namespace gles2 {
 class GLES2Interface;
 }
 }
 
 namespace blink {
 
 class Canvas2DLayerBridgeTest;
@@ skipping 47 matching lines @@
   // Callback for mailboxes given to the compositor from PrepareTextureMailbox.
   void mailboxReleased(const gpu::Mailbox&,
                        const gpu::SyncToken&,
                        bool lostResource);
 
   // ImageBufferSurface implementation
   void finalizeFrame(const FloatRect& dirtyRect);
   void willWritePixels();
   void willOverwriteAllPixels();
   void willOverwriteCanvas();
-  SkCanvas* canvas();
+  PaintCanvas* canvas();
   void disableDeferral(DisableDeferralReason);
   bool checkSurfaceValid();
   bool restoreSurface();
   WebLayer* layer() const;
   bool isAccelerated() const;
   void setFilterQuality(SkFilterQuality);
   void setIsHidden(bool);
   void setImageBuffer(ImageBuffer*);
   void didDraw(const FloatRect&);
   bool writePixels(const SkImageInfo&,
@@ skipping 74 matching lines @@
   void startRecording();
   void skipQueuedDrawCommands();
   void flushRecordingOnly();
   void unregisterTaskObserver();
   void reportSurfaceCreationFailure();
 
   // WebThread::TaskOberver implementation
   void willProcessTask() override;
   void didProcessTask() override;
 
-  SkSurface* getOrCreateSurface(AccelerationHint = PreferAcceleration);
+  PaintSurface* getOrCreateSurface(AccelerationHint = PreferAcceleration);
   bool shouldAccelerate(AccelerationHint) const;
 
   // Returns the GL filter associated with |m_filterQuality|.
   GLenum getGLFilter();
 
 #if USE_IOSURFACE_FOR_2D_CANVAS
   // Creates an IOSurface-backed texture. Copies |image| into the texture.
   // Prepares a mailbox from the texture. The caller must have created a new
   // MailboxInfo, and prepended it to |m_mailboxs|. Returns whether the
   // mailbox was successfully prepared. |mailbox| is an out parameter only
@@ skipping 15 matching lines @@
   void createMailboxInfo();
 
   // Returns whether the mailbox was successfully prepared from the SkImage.
   // The mailbox is an out parameter only populated on success.
   bool prepareMailboxFromImage(sk_sp<SkImage>, cc::TextureMailbox*);
 
   // Resets Skia's texture bindings. This method should be called after
   // changing texture bindings.
   void resetSkiaTextureBinding();
 
-  std::unique_ptr<SkPictureRecorder> m_recorder;
-  sk_sp<SkSurface> m_surface;
+  std::unique_ptr<PaintRecorder> m_recorder;
+  sk_sp<PaintSurface> m_surface;
   sk_sp<SkImage> m_hibernationImage;
   int m_initialSurfaceSaveCount;
   std::unique_ptr<WebExternalTextureLayer> m_layer;
   std::unique_ptr<WebGraphicsContext3DProvider> m_contextProvider;
   std::unique_ptr<SharedContextRateLimiter> m_rateLimiter;
   std::unique_ptr<Logger> m_logger;
   WeakPtrFactory<Canvas2DLayerBridge> m_weakPtrFactory;
   ImageBuffer* m_imageBuffer;
   int m_msaaSampleCount;
   size_t m_bytesAllocated;
@@ skipping 37 matching lines @@
   // Each element in this vector represents an IOSurface backed texture that
   // is ready to be reused.
   // Elements in this vector can safely be purged in low memory conditions.
   Vector<RefPtr<ImageInfo>> m_imageInfoCache;
 #endif  // USE_IOSURFACE_FOR_2D_CANVAS
 };
 
 }  // namespace blink
 
 #endif