Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(36)

Unified Diff: third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTest.cpp

Issue 2290903002: Change (Pass)RefPtr<SkXxx> into sk_sp<SkXxx>. (Closed)
Patch Set: Rebasing... Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTest.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTest.cpp b/third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTest.cpp
index 6aaf06c546152cde532eb69768cf9814c2087459..6cfec04abefaac70b4228176fefac9b155a89ed3 100644
--- a/third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTest.cpp
+++ b/third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTest.cpp
@@ -176,7 +176,7 @@ protected:
TEST_F(DeferredImageDecoderTest, drawIntoSkPicture)
{
m_lazyDecoder->setData(m_data, true);
- RefPtr<SkImage> image = m_lazyDecoder->createFrameAtIndex(0);
+ sk_sp<SkImage> image = m_lazyDecoder->createFrameAtIndex(0);
ASSERT_TRUE(image);
EXPECT_EQ(1, image->width());
EXPECT_EQ(1, image->height());
@@ -203,7 +203,7 @@ TEST_F(DeferredImageDecoderTest, drawIntoSkPictureProgressive)
// Received only half the file.
m_lazyDecoder->setData(partialData, false);
- RefPtr<SkImage> image = m_lazyDecoder->createFrameAtIndex(0);
+ sk_sp<SkImage> image = m_lazyDecoder->createFrameAtIndex(0);
ASSERT_TRUE(image);
SkPictureRecorder recorder;
SkCanvas* tempCanvas = recorder.beginRecording(100, 100, 0, 0);
@@ -233,7 +233,7 @@ static void rasterizeMain(SkCanvas* canvas, SkPicture* picture)
TEST_F(DeferredImageDecoderTest, decodeOnOtherThread)
{
m_lazyDecoder->setData(m_data, true);
- RefPtr<SkImage> image = m_lazyDecoder->createFrameAtIndex(0);
+ sk_sp<SkImage> image = m_lazyDecoder->createFrameAtIndex(0);
ASSERT_TRUE(image);
EXPECT_EQ(1, image->width());
EXPECT_EQ(1, image->height());
@@ -262,7 +262,7 @@ TEST_F(DeferredImageDecoderTest, singleFrameImageLoading)
m_status = ImageFrame::FramePartial;
m_lazyDecoder->setData(m_data, false);
EXPECT_FALSE(m_lazyDecoder->frameIsCompleteAtIndex(0));
- RefPtr<SkImage> image = m_lazyDecoder->createFrameAtIndex(0);
+ sk_sp<SkImage> image = m_lazyDecoder->createFrameAtIndex(0);
ASSERT_TRUE(image);
unsigned firstId = image->uniqueID();
EXPECT_FALSE(m_lazyDecoder->frameIsCompleteAtIndex(0));
@@ -289,7 +289,7 @@ TEST_F(DeferredImageDecoderTest, multiFrameImageLoading)
m_status = ImageFrame::FramePartial;
m_lazyDecoder->setData(m_data, false);
- RefPtr<SkImage> image = m_lazyDecoder->createFrameAtIndex(0);
+ sk_sp<SkImage> image = m_lazyDecoder->createFrameAtIndex(0);
ASSERT_TRUE(image);
unsigned firstId = image->uniqueID();
EXPECT_FALSE(m_lazyDecoder->frameIsCompleteAtIndex(0));
@@ -328,7 +328,7 @@ TEST_F(DeferredImageDecoderTest, decodedSize)
{
m_decodedSize = IntSize(22, 33);
m_lazyDecoder->setData(m_data, true);
- RefPtr<SkImage> image = m_lazyDecoder->createFrameAtIndex(0);
+ 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());
@@ -372,7 +372,7 @@ TEST_F(DeferredImageDecoderTest, frameOpacity)
SkPixmap pixmap(pixInfo, storage.get(), rowBytes);
// Before decoding, the frame is not known to be opaque.
- RefPtr<SkImage> frame = decoder->createFrameAtIndex(0);
+ sk_sp<SkImage> frame = decoder->createFrameAtIndex(0);
ASSERT_TRUE(frame);
EXPECT_FALSE(frame->isOpaque());

Powered by Google App Engine
This is Rietveld 408576698