Rename paint data structures

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

 /*
  * 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 12 matching lines @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "platform/graphics/DeferredImageDecoder.h"
 
 #include "platform/CrossThreadFunctional.h"
 #include "platform/SharedBuffer.h"
 #include "platform/WebTaskRunner.h"
 #include "platform/graphics/ImageDecodingStore.h"
 #include "platform/graphics/ImageFrameGenerator.h"
+#include "platform/graphics/paint/PaintCanvas.h"
+#include "platform/graphics/paint/PaintRecord.h"
+#include "platform/graphics/paint/PaintRecorder.h"
 #include "platform/graphics/test/MockImageDecoder.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebThread.h"
 #include "public/platform/WebTraceLocation.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkImage.h"
-#include "third_party/skia/include/core/SkPicture.h"
-#include "third_party/skia/include/core/SkPictureRecorder.h"
 #include "third_party/skia/include/core/SkPixmap.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/PtrUtil.h"
 #include "wtf/RefPtr.h"
 #include <memory>
 
 namespace blink {
 
 namespace {
@@ skipping 25 matching lines @@
     0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20,
     0x65, 0x7a, 0x67, 0x69, 0x66, 0x2e, 0x63, 0x6f, 0x6d, 0x20, 0x67, 0x69,
     0x66, 0x20, 0x6d, 0x61, 0x6b, 0x65, 0x72, 0x00, 0x2c, 0x00, 0x00, 0x00,
     0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x02, 0x02, 0x44, 0x01, 0x00, 0x21,
     0xf9, 0x04, 0x00, 0x14, 0x00, 0xff, 0x00, 0x2c, 0x00, 0x00, 0x00, 0x00,
     0x01, 0x00, 0x01, 0x00, 0x00, 0x02, 0x02, 0x4c, 0x01, 0x00, 0x3b,
 };
 
 struct Rasterizer {
   SkCanvas* canvas;
-  SkPicture* picture;
+  PaintRecord* picture;
 };
 
 }  // namespace
 
 class DeferredImageDecoderTest : public ::testing::Test,
                                  public MockImageDecoderClient {
  public:
   void SetUp() override {
     ImageDecodingStore::instance().setCacheLimitInBytes(1024 * 1024);
     m_data = SharedBuffer::create(whitePNG, sizeof(whitePNG));
@@ skipping 46 matching lines @@
   IntSize m_decodedSize;
 };
 
 TEST_F(DeferredImageDecoderTest, drawIntoSkPicture) {
   m_lazyDecoder->setData(m_data, true);
   sk_sp<SkImage> image = m_lazyDecoder->createFrameAtIndex(0);
   ASSERT_TRUE(image);
   EXPECT_EQ(1, image->width());
   EXPECT_EQ(1, image->height());
 
-  SkPictureRecorder recorder;
-  SkCanvas* tempCanvas = recorder.beginRecording(100, 100, 0, 0);
+  PaintRecorder recorder;
+  PaintCanvas* tempCanvas = recorder.beginRecording(100, 100, 0, 0);
   tempCanvas->drawImage(image.get(), 0, 0);
-  sk_sp<SkPicture> picture = recorder.finishRecordingAsPicture();
+  sk_sp<PaintRecord> picture = recorder.finishRecordingAsPicture();
   EXPECT_EQ(0, m_decodeRequestCount);
 
   m_surface->getCanvas()->drawPicture(picture);
   EXPECT_EQ(0, m_decodeRequestCount);
 
   SkBitmap canvasBitmap;
   canvasBitmap.allocN32Pixels(100, 100);
   ASSERT_TRUE(m_surface->getCanvas()->readPixels(&canvasBitmap, 0, 0));
   SkAutoLockPixels autoLock(canvasBitmap);
   EXPECT_EQ(SkColorSetARGB(255, 255, 255, 255), canvasBitmap.getColor(0, 0));
 }
 
 TEST_F(DeferredImageDecoderTest, drawIntoSkPictureProgressive) {
   RefPtr<SharedBuffer> partialData =
       SharedBuffer::create(m_data->data(), m_data->size() - 10);
 
   // Received only half the file.
   m_lazyDecoder->setData(partialData, false);
   sk_sp<SkImage> image = m_lazyDecoder->createFrameAtIndex(0);
   ASSERT_TRUE(image);
-  SkPictureRecorder recorder;
-  SkCanvas* tempCanvas = recorder.beginRecording(100, 100, 0, 0);
+  PaintRecorder recorder;
+  PaintCanvas* tempCanvas = recorder.beginRecording(100, 100, 0, 0);
   tempCanvas->drawImage(image.get(), 0, 0);
   m_surface->getCanvas()->drawPicture(recorder.finishRecordingAsPicture());
 
-  // Fully received the file and draw the SkPicture again.
+  // Fully received the file and draw the PaintRecord again.
   m_lazyDecoder->setData(m_data, true);
   image = m_lazyDecoder->createFrameAtIndex(0);
   ASSERT_TRUE(image);
   tempCanvas = recorder.beginRecording(100, 100, 0, 0);
   tempCanvas->drawImage(image.get(), 0, 0);
   m_surface->getCanvas()->drawPicture(recorder.finishRecordingAsPicture());
 
   SkBitmap canvasBitmap;
   canvasBitmap.allocN32Pixels(100, 100);
   ASSERT_TRUE(m_surface->getCanvas()->readPixels(&canvasBitmap, 0, 0));
   SkAutoLockPixels autoLock(canvasBitmap);
   EXPECT_EQ(SkColorSetARGB(255, 255, 255, 255), canvasBitmap.getColor(0, 0));
 }
 
-static void rasterizeMain(SkCanvas* canvas, SkPicture* picture) {
+static void rasterizeMain(PaintCanvas* canvas, PaintRecord* picture) {
   canvas->drawPicture(picture);
 }
 
 TEST_F(DeferredImageDecoderTest, decodeOnOtherThread) {
   m_lazyDecoder->setData(m_data, true);
   sk_sp<SkImage> image = m_lazyDecoder->createFrameAtIndex(0);
   ASSERT_TRUE(image);
   EXPECT_EQ(1, image->width());
   EXPECT_EQ(1, image->height());
 
-  SkPictureRecorder recorder;
-  SkCanvas* tempCanvas = recorder.beginRecording(100, 100, 0, 0);
+  PaintRecorder recorder;
+  PaintCanvas* tempCanvas = recorder.beginRecording(100, 100, 0, 0);
   tempCanvas->drawImage(image.get(), 0, 0);
-  sk_sp<SkPicture> picture = recorder.finishRecordingAsPicture();
+  sk_sp<PaintRecord> picture = recorder.finishRecordingAsPicture();
   EXPECT_EQ(0, m_decodeRequestCount);
 
-  // Create a thread to rasterize SkPicture.
+  // Create a thread to rasterize PaintRecord.
   std::unique_ptr<WebThread> thread =
       WTF::wrapUnique(Platform::current()->createThread("RasterThread"));
   thread->getWebTaskRunner()->postTask(
       BLINK_FROM_HERE,
       crossThreadBind(&rasterizeMain,
                       crossThreadUnretained(m_surface->getCanvas()),
                       crossThreadUnretained(picture.get())));
   thread.reset();
   EXPECT_EQ(0, m_decodeRequestCount);
 
@@ skipping 73 matching lines @@
   m_decodedSize = IntSize(22, 33);
   m_lazyDecoder->setData(m_data, true);
   sk_sp<SkImage> image = m_lazyDecoder->createFrameAtIndex(0);
   ASSERT_TRUE(image);
   EXPECT_EQ(m_decodedSize.width(), image->width());
   EXPECT_EQ(m_decodedSize.height(), image->height());
 
   useMockImageDecoderFactory();
 
   // The following code should not fail any assert.
-  SkPictureRecorder recorder;
-  SkCanvas* tempCanvas = recorder.beginRecording(100, 100, 0, 0);
+  PaintRecorder recorder;
+  PaintCanvas* tempCanvas = recorder.beginRecording(100, 100, 0, 0);
   tempCanvas->drawImage(image.get(), 0, 0);
-  sk_sp<SkPicture> picture = recorder.finishRecordingAsPicture();
+  sk_sp<PaintRecord> picture = recorder.finishRecordingAsPicture();
   EXPECT_EQ(0, m_decodeRequestCount);
   m_surface->getCanvas()->drawPicture(picture);
   EXPECT_EQ(1, m_decodeRequestCount);
 }
 
 TEST_F(DeferredImageDecoderTest, smallerFrameCount) {
   m_frameCount = 1;
   m_lazyDecoder->setData(m_data, false);
   EXPECT_EQ(m_frameCount, m_lazyDecoder->frameCount());
   m_frameCount = 2;
@@ skipping 57 matching lines @@
       SharedBuffer::create(m_data->data(), m_data->size());
   EXPECT_EQ(originalData->size(), m_data->size());
   m_lazyDecoder->setData(originalData, false);
   RefPtr<SharedBuffer> newData = m_lazyDecoder->data();
   EXPECT_EQ(originalData->size(), newData->size());
   EXPECT_EQ(
       0, std::memcmp(originalData->data(), newData->data(), newData->size()));
 }
 
 }  // namespace blink