summaryrefslogtreecommitdiffstats
path: root/ui/gfx/image/image_unittest_util.cc
diff options
context:
space:
mode:
authorpkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-13 02:19:17 +0000
committerpkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-13 02:19:17 +0000
commit023f5e1d03c90150b1f47e952e5a0159ac5597bc (patch)
treea757f30f490d8cb8485644ec6ec7137f0fbb277f /ui/gfx/image/image_unittest_util.cc
parent35d2edd2e2def89bafe671d5ff212e2e97241c1b (diff)
downloadchromium_src-023f5e1d03c90150b1f47e952e5a0159ac5597bc.zip
chromium_src-023f5e1d03c90150b1f47e952e5a0159ac5597bc.tar.gz
chromium_src-023f5e1d03c90150b1f47e952e5a0159ac5597bc.tar.bz2
Removes Image(const unsigned char* png, size_t input_size) in favor of using gfx::Image::CreateFrom1xPNGBytes()
Also converts gfx::Image png API to use base::RefCountedMemory instead of base::RefCountedBytes BUG=160632 Test=None R=rsesek TBR=sky Review URL: https://chromiumcodereview.appspot.com/11415055 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172779 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/image/image_unittest_util.cc')
-rw-r--r--ui/gfx/image/image_unittest_util.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/gfx/image/image_unittest_util.cc b/ui/gfx/image/image_unittest_util.cc
index 4ef1c0c..2441821 100644
--- a/ui/gfx/image/image_unittest_util.cc
+++ b/ui/gfx/image/image_unittest_util.cc
@@ -43,7 +43,7 @@ const SkBitmap CreateBitmap(int width, int height) {
return bitmap;
}
-scoped_refptr<base::RefCountedBytes> CreatePNGBytes(int edge_size) {
+scoped_refptr<base::RefCountedMemory> CreatePNGBytes(int edge_size) {
SkBitmap bitmap = CreateBitmap(edge_size, edge_size);
scoped_refptr<base::RefCountedBytes> bytes(new base::RefCountedBytes());
PNGCodec::EncodeBGRASkBitmap(bitmap, false, &bytes->data());