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

Unified Diff: ui/gfx/icon_util.cc

Issue 9720040: ui/gfx: Do not use the deprecated SkBitmap::getConfig() function. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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 | « ui/gfx/color_utils.cc ('k') | ui/gfx/skbitmap_operations.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/icon_util.cc
diff --git a/ui/gfx/icon_util.cc b/ui/gfx/icon_util.cc
index c3055ccd85e2b3e9446473fce877d584706a9dfe..b6652f0ffa6ce07b99bf5930fb18e7f1976ce502 100644
--- a/ui/gfx/icon_util.cc
+++ b/ui/gfx/icon_util.cc
@@ -55,7 +55,7 @@ HICON IconUtil::CreateHICONFromSkBitmap(const SkBitmap& bitmap) {
// Only 32 bit ARGB bitmaps are supported. We also try to perform as many
// validations as we can on the bitmap.
SkAutoLockPixels bitmap_lock(bitmap);
- if ((bitmap.getConfig() != SkBitmap::kARGB_8888_Config) ||
+ if ((bitmap.config() != SkBitmap::kARGB_8888_Config) ||
(bitmap.width() <= 0) || (bitmap.height() <= 0) ||
(bitmap.getPixels() == NULL))
return NULL;
@@ -235,7 +235,7 @@ bool IconUtil::CreateIconFileFromSkBitmap(const SkBitmap& bitmap,
// Only 32 bit ARGB bitmaps are supported. We also make sure the bitmap has
// been properly initialized.
SkAutoLockPixels bitmap_lock(bitmap);
- if ((bitmap.getConfig() != SkBitmap::kARGB_8888_Config) ||
+ if ((bitmap.config() != SkBitmap::kARGB_8888_Config) ||
(bitmap.height() <= 0) || (bitmap.width() <= 0) ||
(bitmap.getPixels() == NULL))
return false;
« no previous file with comments | « ui/gfx/color_utils.cc ('k') | ui/gfx/skbitmap_operations.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698