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

Unified Diff: ui/gfx/color_analysis.cc

Issue 361643002: setConfig is deprecated, use setInfo or allocPixels instead (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: don't call allocPixels+rowbytes yet (skia bug) Created 6 years, 6 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/codec/png_codec_unittest.cc ('k') | ui/gfx/color_analysis_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/color_analysis.cc
diff --git a/ui/gfx/color_analysis.cc b/ui/gfx/color_analysis.cc
index 5cae9b6d4ccce08832f3e25a64a1257320b1e993..b6af2fee18393b46ac7fe52e52dc4c0347a13b12 100644
--- a/ui/gfx/color_analysis.cc
+++ b/ui/gfx/color_analysis.cc
@@ -419,7 +419,7 @@ gfx::Matrix3F ComputeColorCovariance(const SkBitmap& bitmap) {
return covariance;
// Assume ARGB_8888 format.
- DCHECK(bitmap.colorType() == kPMColor_SkColorType);
+ DCHECK(bitmap.colorType() == kN32_SkColorType);
int64_t r_sum = 0;
int64_t g_sum = 0;
@@ -488,7 +488,7 @@ bool ApplyColorReduction(const SkBitmap& source_bitmap,
DCHECK(source_bitmap.getPixels());
DCHECK(target_bitmap->getPixels());
- DCHECK_EQ(kPMColor_SkColorType, source_bitmap.colorType());
+ DCHECK_EQ(kN32_SkColorType, source_bitmap.colorType());
DCHECK_EQ(kAlpha_8_SkColorType, target_bitmap->colorType());
DCHECK_EQ(source_bitmap.height(), target_bitmap->height());
DCHECK_EQ(source_bitmap.width(), target_bitmap->width());
« no previous file with comments | « ui/gfx/codec/png_codec_unittest.cc ('k') | ui/gfx/color_analysis_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698