content/public/browser/favicon_status.cc - Issue 10832128: Convert FaviconStatus::bitmap from SkBitmap to gfx::Image.

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

Unified Diff: content/public/browser/favicon_status.cc

Issue 10832128: Convert FaviconStatus::bitmap from SkBitmap to gfx::Image. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: tests? Created 8 years, 4 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:

Index: content/public/browser/favicon_status.cc

diff --git a/content/public/browser/favicon_status.cc b/content/public/browser/favicon_status.cc

index c9da916999422ed2d275fea8fca91e5d9174cebc..987ea61ce2b1c8117ccc93374c6bba01872a46b6 100644

--- a/content/public/browser/favicon_status.cc

+++ b/content/public/browser/favicon_status.cc

@@ -10,7 +10,11 @@

namespace content {

FaviconStatus::FaviconStatus() : valid(false) {

- bitmap = *GetContentClient()->browser()->GetDefaultFavicon()->bitmap();

+ image = gfx::Image(*GetContentClient()->browser()->GetDefaultFavicon());

+SkBitmap FaviconStatus::AsBitmap() const {

+ return image.IsEmpty() ? SkBitmap() : *image.ToSkBitmap();

}

} // namespace content