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

Unified Diff: ui/gfx/image/image.h

Issue 10837090: Change return type of FaviconTabHelper::GetFavicon() to gfx::Image. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/public/browser/favicon_status.cc ('k') | ui/gfx/image/image.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/image/image.h
diff --git a/ui/gfx/image/image.h b/ui/gfx/image/image.h
index c03db3ad18e783231e57e53712350e10e925f0c6..04a79daffec0673be643d72e04bf7a53e760f501 100644
--- a/ui/gfx/image/image.h
+++ b/ui/gfx/image/image.h
@@ -107,6 +107,13 @@ class UI_EXPORT Image {
NSImage* ToNSImage() const;
#endif
+ // Same as ToSkBitmap(), but returns a null SkBitmap if this image is empty.
+ SkBitmap AsBitmap() const;
+
+ // Same as ToSkBitmap(), but returns a ImageSkia with a null SkBitmap if this
+ // image is empty.
+ ImageSkia AsImageSkia() const;
+
// Performs a conversion, like above, but returns a copy of the result rather
// than a weak pointer. The caller is responsible for deleting the result.
// Note that the result is only a copy in terms of memory management; the
« no previous file with comments | « content/public/browser/favicon_status.cc ('k') | ui/gfx/image/image.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698