ui/gfx/image/image.cc - Issue 10837090: Change return type of FaviconTabHelper::GetFavicon() 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: ui/gfx/image/image.cc

Issue 10837090: Change return type of FaviconTabHelper::GetFavicon() to gfx::Image. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: win? 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: ui/gfx/image/image.cc

diff --git a/ui/gfx/image/image.cc b/ui/gfx/image/image.cc

index ea302ab58a6297a3a9a9861d93be30ab5c29698a..9854787733b7cf9029de07fec2ffb50081d147b3 100644

--- a/ui/gfx/image/image.cc

+++ b/ui/gfx/image/image.cc

@@ -337,6 +337,14 @@ NSImage* Image::ToNSImage() const {

}

#endif

+SkBitmap Image::AsBitmap() const {

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

+ImageSkia Image::AsImageSkia() const {

+ return IsEmpty() ? ImageSkia(SkBitmap()) : *ToImageSkia();

ImageSkia* Image::CopyImageSkia() const {

return new ImageSkia(*ToImageSkia());

}