Index: ui/gfx/color_utils.cc |
=================================================================== |
--- ui/gfx/color_utils.cc (revision 201894) |
+++ ui/gfx/color_utils.cc (working copy) |
@@ -197,15 +197,12 @@ |
DCHECK_EQ(SkBitmap::kARGB_8888_Config, bitmap.config()); |
SkAutoLockPixels bitmap_lock(bitmap); |
- if (!bitmap.getPixels()) |
- return; |
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)); |
- for (int x = 0; x < pixel_width; ++x, ++current_color) |
- histogram[GetLuminanceForColor(*current_color)]++; |
+ for (int x = 0; x < pixel_width; ++x) |
+ ++histogram[GetLuminanceForColor(bitmap.getColor(x, y))]; |
} |
} |