cc/paint: Remove cc::PaintSurface.

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 16 matching lines @@
 
 #include <memory>
 #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/paint/PaintSurface.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/SkImage.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"
@@ skipping 54 matching lines @@
                                  public MockImageDecoderClient {
  public:
   void SetUp() override {
     ImageDecodingStore::instance().setCacheLimitInBytes(1024 * 1024);
     m_data = SharedBuffer::create(whitePNG, sizeof(whitePNG));
     m_frameCount = 1;
     std::unique_ptr<MockImageDecoder> decoder = MockImageDecoder::create(this);
     m_actualDecoder = decoder.get();
     m_actualDecoder->setSize(1, 1);
     m_lazyDecoder = DeferredImageDecoder::createForTesting(std::move(decoder));
-    m_surface = PaintSurface::MakeRasterN32Premul(100, 100);
-    ASSERT_TRUE(m_surface.get());
+    m_bitmap.allocPixels(SkImageInfo::MakeN32Premul(100, 100));
+    m_canvas = base::MakeUnique<cc::SkiaPaintCanvas>(m_bitmap);
     m_decodeRequestCount = 0;
     m_repetitionCount = cAnimationNone;
     m_status = ImageFrame::FrameComplete;
     m_frameDuration = 0;
     m_decodedSize = m_actualDecoder->size();
   }
 
   void TearDown() override { ImageDecodingStore::instance().clear(); }
 
   void decoderBeingDestroyed() override { m_actualDecoder = 0; }
@@ skipping 12 matching lines @@
 
  protected:
   void useMockImageDecoderFactory() {
     m_lazyDecoder->frameGenerator()->setImageDecoderFactory(
         MockImageDecoderFactory::create(this, m_decodedSize));
   }
 
   // Don't own this but saves the pointer to query states.
   MockImageDecoder* m_actualDecoder;
   std::unique_ptr<DeferredImageDecoder> m_lazyDecoder;
-  sk_sp<PaintSurface> m_surface;
+  SkBitmap m_bitmap;
+  std::unique_ptr<cc::PaintCanvas> m_canvas;
   int m_decodeRequestCount;
   RefPtr<SharedBuffer> m_data;
   size_t m_frameCount;
   int m_repetitionCount;
   ImageFrame::Status m_status;
   float m_frameDuration;
   IntSize m_decodedSize;
 };
 
 TEST_F(DeferredImageDecoderTest, drawIntoPaintRecord) {
   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());
 
   PaintRecorder recorder;
   PaintCanvas* tempCanvas = recorder.beginRecording(100, 100);
   tempCanvas->drawImage(image, 0, 0);
   sk_sp<PaintRecord> record = recorder.finishRecordingAsPicture();
   EXPECT_EQ(0, m_decodeRequestCount);
 
-  m_surface->getCanvas()->drawPicture(record);
+  m_canvas->drawPicture(record);
   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));
+  SkAutoLockPixels autoLock(m_bitmap);
+  EXPECT_EQ(SkColorSetARGB(255, 255, 255, 255), m_bitmap.getColor(0, 0));
 }
 
 TEST_F(DeferredImageDecoderTest, drawIntoPaintRecordProgressive) {
   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);
   PaintRecorder recorder;
   PaintCanvas* tempCanvas = recorder.beginRecording(100, 100);
   tempCanvas->drawImage(std::move(image), 0, 0);
-  m_surface->getCanvas()->drawPicture(recorder.finishRecordingAsPicture());
+  m_canvas->drawPicture(recorder.finishRecordingAsPicture());
 
   // 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);
   tempCanvas->drawImage(std::move(image), 0, 0);
-  m_surface->getCanvas()->drawPicture(recorder.finishRecordingAsPicture());
+  m_canvas->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));
+  SkAutoLockPixels autoLock(m_bitmap);
+  EXPECT_EQ(SkColorSetARGB(255, 255, 255, 255), m_bitmap.getColor(0, 0));
 }
 
 static void rasterizeMain(PaintCanvas* canvas, sk_sp<PaintRecord> record) {
   canvas->drawPicture(record);
 }
 
 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());
 
   PaintRecorder recorder;
   PaintCanvas* tempCanvas = recorder.beginRecording(100, 100);
   tempCanvas->drawImage(std::move(image), 0, 0);
   sk_sp<PaintRecord> record = recorder.finishRecordingAsPicture();
   EXPECT_EQ(0, m_decodeRequestCount);
 
   // 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()), record));
+      crossThreadBind(&rasterizeMain, crossThreadUnretained(m_canvas.get()),
+                      record));
   thread.reset();
   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));
+  SkAutoLockPixels autoLock(m_bitmap);
+  EXPECT_EQ(SkColorSetARGB(255, 255, 255, 255), m_bitmap.getColor(0, 0));
 }
 
 TEST_F(DeferredImageDecoderTest, singleFrameImageLoading) {
   m_status = ImageFrame::FramePartial;
   m_lazyDecoder->setData(m_data, false);
   EXPECT_FALSE(m_lazyDecoder->frameIsCompleteAtIndex(0));
   sk_sp<SkImage> image = m_lazyDecoder->createFrameAtIndex(0);
   ASSERT_TRUE(image);
   unsigned firstId = image->uniqueID();
   EXPECT_FALSE(m_lazyDecoder->frameIsCompleteAtIndex(0));
@@ skipping 63 matching lines @@
   EXPECT_EQ(m_decodedSize.height(), image->height());
 
   useMockImageDecoderFactory();
 
   // The following code should not fail any assert.
   PaintRecorder recorder;
   PaintCanvas* tempCanvas = recorder.beginRecording(100, 100);
   tempCanvas->drawImage(std::move(image), 0, 0);
   sk_sp<PaintRecord> record = recorder.finishRecordingAsPicture();
   EXPECT_EQ(0, m_decodeRequestCount);
-  m_surface->getCanvas()->drawPicture(record);
+  m_canvas->drawPicture(record);
   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;
   m_lazyDecoder->setData(m_data, false);
   EXPECT_EQ(m_frameCount, m_lazyDecoder->frameCount());
@@ skipping 61 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