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

Unified Diff: Source/platform/graphics/ImageFrameGeneratorTest.cpp

Issue 201213002: Remove uses of SkBitmap::Config (deprecated) from core/ and platform/. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: schenney comments Created 6 years, 9 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: Source/platform/graphics/ImageFrameGeneratorTest.cpp
diff --git a/Source/platform/graphics/ImageFrameGeneratorTest.cpp b/Source/platform/graphics/ImageFrameGeneratorTest.cpp
index 3ea48d0cb1e36c8ebfb2ebe3c2a33db5e88904b3..fc1da7682cf1a286162659fd209db145b71dc78c 100644
--- a/Source/platform/graphics/ImageFrameGeneratorTest.cpp
+++ b/Source/platform/graphics/ImageFrameGeneratorTest.cpp
@@ -92,8 +92,8 @@ protected:
PassOwnPtr<ScaledImageFragment> createCompleteImage(const SkISize& size)
{
SkBitmap bitmap;
- bitmap.setConfig(SkBitmap::kARGB_8888_Config, size.width(), size.height());
- bitmap.allocPixels();
+ if (!bitmap.allocN32Pixels(size.width(), size.height()))
+ return nullptr;
return ScaledImageFragment::createComplete(size, 0, bitmap);
}
@@ -130,8 +130,10 @@ protected:
TEST_F(ImageFrameGeneratorTest, cacheHit)
{
+ OwnPtr<ScaledImageFragment> completeImageTemp = createCompleteImage(fullSize());
+ ASSERT_TRUE(completeImageTemp);
const ScaledImageFragment* fullImage = ImageDecodingStore::instance()->insertAndLockCache(
- m_generator.get(), createCompleteImage(fullSize()));
+ m_generator.get(), completeImageTemp.release());
EXPECT_EQ(fullSize(), fullImage->scaledSize());
ImageDecodingStore::instance()->unlockCache(m_generator.get(), fullImage);
« no previous file with comments | « Source/platform/graphics/ImageDecodingStoreTest.cpp ('k') | Source/platform/graphics/UnacceleratedImageBufferSurface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698