ImagePixelLocker now manually allocates SkPixmap

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 327 matching lines @@
 }
 
 TEST_F(DeferredImageDecoderTest, frameOpacity)
 {
     OwnPtr<ImageDecoder> actualDecoder = ImageDecoder::create(*m_data,
         ImageDecoder::AlphaPremultiplied, ImageDecoder::GammaAndColorProfileApplied);
     OwnPtr<DeferredImageDecoder> decoder = DeferredImageDecoder::createForTesting(actualDecoder.release());
     decoder->setData(*m_data, true);
 
     SkImageInfo pixInfo = SkImageInfo::MakeN32Premul(1, 1);
-    SkAutoPixmapStorage pixels;
-    pixels.alloc(pixInfo);
+
+    size_t rowBytes = pixInfo.minRowBytes();
+    size_t size = pixInfo.getSafeSize(rowBytes);
+
+    SkAutoMalloc storage(size);
+    SkPixmap pixmap(pixInfo, storage.get(), rowBytes);
 
     // Before decoding, the frame is not known to be opaque.
     RefPtr<SkImage> frame = decoder->createFrameAtIndex(0);
     ASSERT_TRUE(frame);
     EXPECT_FALSE(frame->isOpaque());
 
     // Force a lazy decode by reading pixels.
-    EXPECT_TRUE(frame->readPixels(pixels, 0, 0));
+    EXPECT_TRUE(frame->readPixels(pixmap, 0, 0));
 
     // 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(pixels, 0, 0));
+    EXPECT_TRUE(frame->readPixels(pixmap, 0, 0));
 }
 
 } // namespace blink