Rename paint data structures

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

 // 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.
 
 #include "platform/graphics/RecordingImageBufferSurface.h"
 
 #include "platform/WebTaskRunner.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/ImageBuffer.h"
 #include "platform/graphics/ImageBufferClient.h"
 #include "platform/graphics/UnacceleratedImageBufferSurface.h"
+#include "platform/graphics/paint/PaintCanvas.h"
+#include "platform/graphics/paint/PaintRecord.h"
 #include "platform/testing/TestingPlatformSupport.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebThread.h"
 #include "public/platform/WebTraceLocation.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/skia/include/core/SkCanvas.h"
-#include "third_party/skia/include/core/SkPictureRecorder.h"
 #include "wtf/PtrUtil.h"
 #include "wtf/RefPtr.h"
 #include <memory>
 
 using testing::Test;
 
 namespace blink {
 
 class FakeImageBufferClient : public ImageBufferClient,
                               public WebThread::TaskObserver {
@@ skipping 16 matching lines @@
   }
 
   // TaskObserver implementation
   void willProcessTask() override { NOTREACHED(); }
   void didProcessTask() override {
     ASSERT_TRUE(m_isDirty);
     FloatRect dirtyRect(0, 0, 1, 1);
     m_imageBuffer->finalizeFrame(dirtyRect);
     ASSERT_FALSE(m_isDirty);
   }
-  void restoreCanvasMatrixClipStack(SkCanvas*) const override {}
+  void restoreCanvasMatrixClipStack(PaintCanvas*) const override {}
 
   void fakeDraw() {
     if (m_isDirty)
       return;
     m_isDirty = true;
     Platform::current()->currentThread()->addTaskObserver(this);
   }
 
   int frameCount() { return m_frameCount; }
 
@@ skipping 41 matching lines @@
     m_imageBuffer = ImageBuffer::create(std::move(testSurface));
     EXPECT_FALSE(!m_imageBuffer);
     m_fakeImageBufferClient =
         WTF::wrapUnique(new FakeImageBufferClient(m_imageBuffer.get()));
     m_imageBuffer->setClient(m_fakeImageBufferClient.get());
   }
 
  public:
   void testEmptyPicture() {
     m_testSurface->initializeCurrentFrame();
-    sk_sp<SkPicture> picture = m_testSurface->getPicture();
+    sk_sp<PaintRecord> picture = m_testSurface->getPicture();
     EXPECT_TRUE((bool)picture.get());
     EXPECT_EQ(1, m_fakeImageBufferClient->frameCount());
     expectDisplayListEnabled(true);
   }
 
   void testNoFallbackWithClear() {
     m_testSurface->initializeCurrentFrame();
     m_testSurface->willOverwriteCanvas();
     m_testSurface->getPicture();
     EXPECT_EQ(1, m_fakeImageBufferClient->frameCount());
@@ skipping 66 matching lines @@
     m_testSurface->willOverwriteCanvas();
     EXPECT_EQ(2, m_fakeImageBufferClient->frameCount());
     m_testSurface->getPicture();
     EXPECT_EQ(3, m_fakeImageBufferClient->frameCount());
     expectDisplayListEnabled(true);
   }
 
   void testClearRect() {
     m_testSurface->initializeCurrentFrame();
     m_testSurface->getPicture();
-    SkPaint clearPaint;
+    PaintFlags clearPaint;
     clearPaint.setBlendMode(SkBlendMode::kClear);
     m_imageBuffer->canvas()->drawRect(
         SkRect::MakeWH(m_testSurface->size().width(),
                        m_testSurface->size().height()),
         clearPaint);
     m_fakeImageBufferClient->fakeDraw();
     EXPECT_EQ(1, m_fakeImageBufferClient->frameCount());
     m_testSurface->getPicture();
     EXPECT_EQ(2, m_fakeImageBufferClient->frameCount());
     expectDisplayListEnabled(true);
@@ skipping 55 matching lines @@
   CALL_TEST_TASK_WRAPPER(testAnimatedWithClear)
   expectDisplayListEnabled(true);
 }
 
 TEST_F(RecordingImageBufferSurfaceTest, testClearRect) {
   CALL_TEST_TASK_WRAPPER(testClearRect);
   expectDisplayListEnabled(true);
 }
 
 }  // namespace blink