Rename paint data structures

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef RecordingImageBufferSurface_h
 #define RecordingImageBufferSurface_h
 
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/ImageBufferSurface.h"
 #include "public/platform/WebThread.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
 #include "wtf/Allocator.h"
 #include "wtf/Noncopyable.h"
 #include <memory>
 
-class SkCanvas;
-class SkPicture;
-class SkPictureRecorder;
-
 namespace blink {
 
 class ImageBuffer;
 class RecordingImageBufferSurfaceTest;
 
 class RecordingImageBufferFallbackSurfaceFactory {
   USING_FAST_MALLOC(RecordingImageBufferFallbackSurfaceFactory);
   WTF_MAKE_NONCOPYABLE(RecordingImageBufferFallbackSurfaceFactory);
 
  public:
@@ skipping 19 matching lines @@
   RecordingImageBufferSurface(
       const IntSize&,
       std::unique_ptr<RecordingImageBufferFallbackSurfaceFactory>
           fallbackFactory = nullptr,
       OpacityMode = NonOpaque,
       sk_sp<SkColorSpace> = nullptr,
       SkColorType = kN32_SkColorType);
   ~RecordingImageBufferSurface() override;
 
   // Implementation of ImageBufferSurface interfaces
-  SkCanvas* canvas() override;
+  PaintCanvas* canvas() override;
   void disableDeferral(DisableDeferralReason) override;
-  sk_sp<SkPicture> getPicture() override;
+  sk_sp<PaintRecord> getPicture() override;
   void flush(FlushReason) override;
   void didDraw(const FloatRect&) override;
   bool isValid() const override { return true; }
   bool isRecording() const override { return !m_fallbackSurface; }
   bool writePixels(const SkImageInfo& origInfo,
                    const void* pixels,
                    size_t rowBytes,
                    int x,
                    int y) override;
   void willOverwriteCanvas() override;
@@ skipping 49 matching lines @@
     FallbackReasonCount,
   };
 
  private:
   friend class RecordingImageBufferSurfaceTest;  // for unit testing
   void fallBackToRasterCanvas(FallbackReason);
   void initializeCurrentFrame();
   bool finalizeFrameInternal(FallbackReason*);
   int approximateOpCount();
 
-  std::unique_ptr<SkPictureRecorder> m_currentFrame;
-  sk_sp<SkPicture> m_previousFrame;
+  std::unique_ptr<PaintRecorder> m_currentFrame;
+  sk_sp<PaintRecord> m_previousFrame;
   std::unique_ptr<ImageBufferSurface> m_fallbackSurface;
   ImageBuffer* m_imageBuffer;
   int m_initialSaveCount;
   int m_currentFramePixelCount;
   int m_previousFramePixelCount;
   bool m_frameWasCleared;
   bool m_didRecordDrawCommandsInCurrentFrame;
   bool m_currentFrameHasExpensiveOp;
   bool m_previousFrameHasExpensiveOp;
   std::unique_ptr<RecordingImageBufferFallbackSurfaceFactory> m_fallbackFactory;
 };
 
 }  // namespace blink
 
 #endif