summaryrefslogtreecommitdiffstats
path: root/skia
diff options
context:
space:
mode:
Diffstat (limited to 'skia')
-rw-r--r--skia/ext/vector_canvas_unittest.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/skia/ext/vector_canvas_unittest.cc b/skia/ext/vector_canvas_unittest.cc
index 5dbd17f..b1f9a7c 100644
--- a/skia/ext/vector_canvas_unittest.cc
+++ b/skia/ext/vector_canvas_unittest.cc
@@ -81,7 +81,9 @@ class Image {
EXPECT_TRUE(compressed.size());
WebCore::PNGImageDecoder decoder;
decoder.setData(WebCore::SharedBuffer::adoptVector(compressed).get(), true);
- SetSkBitmap(decoder.frameBufferAtIndex(0)->bitmap());
+ scoped_ptr<NativeImageSkia> image_data(
+ decoder.frameBufferAtIndex(0)->asNewNativeImage());
+ SetSkBitmap(*image_data);
}
// Loads the image from a canvas.
@@ -325,7 +327,9 @@ void LoadPngFileToSkBitmap(const std::wstring& filename,
EXPECT_TRUE(compressed.size());
WebCore::PNGImageDecoder decoder;
decoder.setData(WebCore::SharedBuffer::adoptVector(compressed).get(), true);
- *bitmap = decoder.frameBufferAtIndex(0)->bitmap();
+ scoped_ptr<NativeImageSkia> image_data(
+ decoder.frameBufferAtIndex(0)->asNewNativeImage());
+ *bitmap = *image_data;
EXPECT_EQ(is_opaque, bitmap->isOpaque());
Premultiply(*bitmap);
}