chrome/browser/icon_loader_chromeos.cc - Issue 10378009: Get rid of Image::Image(SkBitmap*)

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/icon_loader_chromeos.cc

Issue 10378009: Get rid of Image::Image(SkBitmap*) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 7 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/history/history_tab_helper.cc ('k') | chrome/browser/profiles/gaia_info_update_service.cc » ('j') | ui/base/resource/resource_bundle.cc » ('J')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/icon_loader.h"	5 #include "chrome/browser/icon_loader.h"

6	6

7 #include <map>	7 #include <map>

8 #include <string>	8 #include <string>

9 #include <utility>	9 #include <utility>

10	10

(...skipping 185 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
196 LAZY_INSTANCE_INITIALIZER;	196 LAZY_INSTANCE_INITIALIZER;

197 int idr = icon_mapper.Get().Lookup(group_, icon_size_);	197 int idr = icon_mapper.Get().Lookup(group_, icon_size_);

198 ResourceBundle& rb = ResourceBundle::GetSharedInstance();	198 ResourceBundle& rb = ResourceBundle::GetSharedInstance();

199 scoped_refptr<base::RefCountedStaticMemory> bytes(	199 scoped_refptr<base::RefCountedStaticMemory> bytes(

200 rb.LoadDataResourceBytes(idr));	200 rb.LoadDataResourceBytes(idr));

201 DCHECK(bytes.get());	201 DCHECK(bytes.get());

202 SkBitmap bitmap;	202 SkBitmap bitmap;

203 if (!gfx::PNGCodec::Decode(bytes->front(), bytes->size(), &bitmap))	203 if (!gfx::PNGCodec::Decode(bytes->front(), bytes->size(), &bitmap))

204 NOTREACHED();	204 NOTREACHED();

205 image_.reset(new gfx::Image(	205 image_.reset(new gfx::Image(

206 GenerateBitmapWithSize(&bitmap, IconSizeToPixelSize(icon_size_))));	206 *GenerateBitmapWithSize(&bitmap, IconSizeToPixelSize(icon_size_))));
	sky 2012/05/04 16:18:23 Doesn't this leak now? Doesn't this leak now?
207 target_message_loop_->PostTask(	207 target_message_loop_->PostTask(

208 FROM_HERE, base::Bind(&IconLoader::NotifyDelegate, this));	208 FROM_HERE, base::Bind(&IconLoader::NotifyDelegate, this));

209 }	209 }

OLD	NEW