Index: ui/gfx/color_utils.cc |
diff --git a/ui/gfx/color_utils.cc b/ui/gfx/color_utils.cc |
index dfcf19603b8c4dc32c7c55fd588095f4aaeaf70b..8854119b2520bfd906c129872bf8db3737b2a347 100644 |
--- a/ui/gfx/color_utils.cc |
+++ b/ui/gfx/color_utils.cc |
@@ -242,18 +242,18 @@ SkColor GetAverageColorOfFavicon(SkBitmap* favicon, SkAlpha alpha) { |
SkColorSetARGB(alpha, 0, 0, 0); |
} |
-void BuildLumaHistogram(SkBitmap* bitmap, int histogram[256]) { |
- SkAutoLockPixels bitmap_lock(*bitmap); |
- if (!bitmap->getPixels()) |
+void BuildLumaHistogram(const SkBitmap& bitmap, int histogram[256]) { |
+ SkAutoLockPixels bitmap_lock(bitmap); |
+ if (!bitmap.getPixels()) |
return; |
// Assume ARGB_8888 format. |
- DCHECK(bitmap->getConfig() == SkBitmap::kARGB_8888_Config); |
+ DCHECK(bitmap.getConfig() == SkBitmap::kARGB_8888_Config); |
- int pixel_width = bitmap->width(); |
- int pixel_height = bitmap->height(); |
+ int pixel_width = bitmap.width(); |
+ int pixel_height = bitmap.height(); |
for (int y = 0; y < pixel_height; ++y) { |
- SkColor* current_color = static_cast<uint32_t*>(bitmap->getAddr32(0, y)); |
+ SkColor* current_color = static_cast<uint32_t*>(bitmap.getAddr32(0, y)); |
for (int x = 0; x < pixel_width; ++x, ++current_color) |
histogram[GetLuminanceForColor(*current_color)]++; |
} |