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

Unified Diff: skia/ext/vector_canvas_unittest.cc

Issue 121001: Update DEPS to pull in upstream change that removes RGBA32Buffer::bitmap(), a... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 6 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
« no previous file with comments | « DEPS ('k') | webkit/glue/webdevtoolsclient_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: skia/ext/vector_canvas_unittest.cc
===================================================================
--- skia/ext/vector_canvas_unittest.cc (revision 18075)
+++ skia/ext/vector_canvas_unittest.cc (working copy)
@@ -81,7 +81,9 @@
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 @@
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);
}
« no previous file with comments | « DEPS ('k') | webkit/glue/webdevtoolsclient_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698