Clean up cc/paint interfaces

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 144 matching lines @@
 
 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.get(), 0, 0);
+  tempCanvas->drawImage(image, 0, 0);
   sk_sp<PaintRecord> record = recorder.finishRecordingAsPicture();
   EXPECT_EQ(0, m_decodeRequestCount);
 
   m_surface->getCanvas()->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));
 }
 
 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(image.get(), 0, 0);
+  tempCanvas->drawImage(image, 0, 0);

[danakj, 2017/03/16 20:06:15]

move()

   m_surface->getCanvas()->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(image.get(), 0, 0);
+  tempCanvas->drawImage(image, 0, 0);

[danakj, 2017/03/16 20:06:15]

move()

   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(PaintCanvas* canvas, PaintRecord* record) {
+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(image.get(), 0, 0);
+  tempCanvas->drawImage(image, 0, 0);

[danakj, 2017/03/16 20:06:15]

move()

   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()),
-                      crossThreadUnretained(record.get())));
+                      crossThreadUnretained(m_surface->getCanvas()), 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));
 }
 
@@ skipping 68 matching lines @@
   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.
   PaintRecorder recorder;
   PaintCanvas* tempCanvas = recorder.beginRecording(100, 100);
-  tempCanvas->drawImage(image.get(), 0, 0);
+  tempCanvas->drawImage(image, 0, 0);

[danakj, 2017/03/16 20:06:15]

move()

   sk_sp<PaintRecord> record = recorder.finishRecordingAsPicture();
   EXPECT_EQ(0, m_decodeRequestCount);
   m_surface->getCanvas()->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());
@@ skipping 64 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