| Index: third_party/WebKit/Source/platform/graphics/ImageDecodingStoreTest.cpp
|
| diff --git a/third_party/WebKit/Source/platform/graphics/ImageDecodingStoreTest.cpp b/third_party/WebKit/Source/platform/graphics/ImageDecodingStoreTest.cpp
|
| index 1fa2ccef3d1251da700d72b5e5a8029765a3d6ed..809174a14c901ccf6f029e17a5c84db1d0dc2d78 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/ImageDecodingStoreTest.cpp
|
| +++ b/third_party/WebKit/Source/platform/graphics/ImageDecodingStoreTest.cpp
|
| @@ -85,7 +85,7 @@ TEST_F(ImageDecodingStoreTest, insertDecoder)
|
| OwnPtr<ImageDecoder> decoder = MockImageDecoder::create(this);
|
| decoder->setSize(1, 1);
|
| const ImageDecoder* refDecoder = decoder.get();
|
| - ImageDecodingStore::instance().insertDecoder(m_generator.get(), decoder.release());
|
| + ImageDecodingStore::instance().insertDecoder(m_generator.get(), std::move(decoder));
|
| EXPECT_EQ(1, ImageDecodingStore::instance().cacheEntries());
|
| EXPECT_EQ(4u, ImageDecodingStore::instance().memoryUsageInBytes());
|
|
|
| @@ -105,9 +105,9 @@ TEST_F(ImageDecodingStoreTest, evictDecoder)
|
| decoder1->setSize(1, 1);
|
| decoder2->setSize(2, 2);
|
| decoder3->setSize(3, 3);
|
| - ImageDecodingStore::instance().insertDecoder(m_generator.get(), decoder1.release());
|
| - ImageDecodingStore::instance().insertDecoder(m_generator.get(), decoder2.release());
|
| - ImageDecodingStore::instance().insertDecoder(m_generator.get(), decoder3.release());
|
| + ImageDecodingStore::instance().insertDecoder(m_generator.get(), std::move(decoder1));
|
| + ImageDecodingStore::instance().insertDecoder(m_generator.get(), std::move(decoder2));
|
| + ImageDecodingStore::instance().insertDecoder(m_generator.get(), std::move(decoder3));
|
| EXPECT_EQ(3, ImageDecodingStore::instance().cacheEntries());
|
| EXPECT_EQ(56u, ImageDecodingStore::instance().memoryUsageInBytes());
|
|
|
| @@ -132,9 +132,9 @@ TEST_F(ImageDecodingStoreTest, decoderInUseNotEvicted)
|
| decoder1->setSize(1, 1);
|
| decoder2->setSize(2, 2);
|
| decoder3->setSize(3, 3);
|
| - ImageDecodingStore::instance().insertDecoder(m_generator.get(), decoder1.release());
|
| - ImageDecodingStore::instance().insertDecoder(m_generator.get(), decoder2.release());
|
| - ImageDecodingStore::instance().insertDecoder(m_generator.get(), decoder3.release());
|
| + ImageDecodingStore::instance().insertDecoder(m_generator.get(), std::move(decoder1));
|
| + ImageDecodingStore::instance().insertDecoder(m_generator.get(), std::move(decoder2));
|
| + ImageDecodingStore::instance().insertDecoder(m_generator.get(), std::move(decoder3));
|
| EXPECT_EQ(3, ImageDecodingStore::instance().cacheEntries());
|
|
|
| ImageDecoder* testDecoder;
|
| @@ -158,7 +158,7 @@ TEST_F(ImageDecodingStoreTest, removeDecoder)
|
| OwnPtr<ImageDecoder> decoder = MockImageDecoder::create(this);
|
| decoder->setSize(1, 1);
|
| const ImageDecoder* refDecoder = decoder.get();
|
| - ImageDecodingStore::instance().insertDecoder(m_generator.get(), decoder.release());
|
| + ImageDecodingStore::instance().insertDecoder(m_generator.get(), std::move(decoder));
|
| EXPECT_EQ(1, ImageDecodingStore::instance().cacheEntries());
|
| EXPECT_EQ(4u, ImageDecodingStore::instance().memoryUsageInBytes());
|
|
|
|
|