Use sk_sp-based picture recording APIs in Blink

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 143 matching lines @@
 {
     m_lazyDecoder->setData(*m_data, true);
     RefPtr<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);
     tempCanvas->drawImage(image.get(), 0, 0);
-    RefPtr<SkPicture> picture = adoptRef(recorder.endRecording());
+    sk_sp<SkPicture> picture = recorder.finishRecordingAsPicture();
     EXPECT_EQ(0, m_decodeRequestCount);
 
-    m_surface->getCanvas()->drawPicture(picture.get());
+    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);
     RefPtr<SkImage> image = m_lazyDecoder->createFrameAtIndex(0);
     ASSERT_TRUE(image);
     SkPictureRecorder recorder;
     SkCanvas* tempCanvas = recorder.beginRecording(100, 100, 0, 0);
     tempCanvas->drawImage(image.get(), 0, 0);
-    RefPtr<SkPicture> picture = adoptRef(recorder.endRecording());
-    m_surface->getCanvas()->drawPicture(picture.get());
+    sk_sp<SkPicture> picture = recorder.finishRecordingAsPicture();

[tomhudson, 2016/03/24 19:52:40]

We can fold these (two) calls into the drawPicture() calls and get rid of the
temps, right? I thought that was a pattern Mike was encouraging.

(Wasn't encouraging it in e.g. drawIntoSkPicture because I'm assuming they want
to test their invariants between picture recording and picture draw.)

[f(malita), 2016/03/24 20:22:41]

Right, that's the optimal pattern - but with tests I tend to get lazy :)

Done.

+    m_surface->getCanvas()->drawPicture(picture);
 
     // Fully received the file and draw the SkPicture 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);
-    picture = adoptRef(recorder.endRecording());
-    m_surface->getCanvas()->drawPicture(picture.get());
+    picture = recorder.finishRecordingAsPicture();
+    m_surface->getCanvas()->drawPicture(picture);
 
     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)
 {
     canvas->drawPicture(picture);
 }
 
 TEST_F(DeferredImageDecoderTest, decodeOnOtherThread)
 {
     m_lazyDecoder->setData(*m_data, true);
     RefPtr<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);
     tempCanvas->drawImage(image.get(), 0, 0);
-    RefPtr<SkPicture> picture = adoptRef(recorder.endRecording());
+    sk_sp<SkPicture> picture = recorder.finishRecordingAsPicture();
     EXPECT_EQ(0, m_decodeRequestCount);
 
     // Create a thread to rasterize SkPicture.
     OwnPtr<WebThread> thread = adoptPtr(Platform::current()->createThread("RasterThread"));
     thread->getWebTaskRunner()->postTask(BLINK_FROM_HERE, threadSafeBind(&rasterizeMain, AllowCrossThreadAccess(m_surface->getCanvas()), AllowCrossThreadAccess(picture.get())));
     thread.clear();
     EXPECT_EQ(0, m_decodeRequestCount);
 
     SkBitmap canvasBitmap;
     canvasBitmap.allocN32Pixels(100, 100);
@@ skipping 77 matching lines @@
     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);
     tempCanvas->drawImage(image.get(), 0, 0);
-    RefPtr<SkPicture> picture = adoptRef(recorder.endRecording());
+    sk_sp<SkPicture> picture = recorder.finishRecordingAsPicture();
     EXPECT_EQ(0, m_decodeRequestCount);
-    m_surface->getCanvas()->drawPicture(picture.get());
+    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;
     m_lazyDecoder->setData(*m_data, false);
@@ skipping 29 matching lines @@
     // After decoding, the frame is known to be opaque.
     frame = decoder->createFrameAtIndex(0);
     ASSERT_TRUE(frame);
     EXPECT_TRUE(frame->isOpaque());
 
     // Re-generating the opaque-marked frame should not fail.
     EXPECT_TRUE(frame->readPixels(pixmap, 0, 0));
 }
 
 } // namespace blink