Fix the PNCodec error on Android caused by different Skia color format.

ui/gfx/codec/png_codec.cc

Index: ui/gfx/codec/png_codec.cc
diff --git a/ui/gfx/codec/png_codec.cc b/ui/gfx/codec/png_codec.cc
index 474fbc9f3999b9464a990aaef0f255080c0e2a6e..1cb2b08741e8e5c49c6c38b9d391725df1889339 100644
--- a/ui/gfx/codec/png_codec.cc
+++ b/ui/gfx/codec/png_codec.cc
@@ -64,9 +64,9 @@ void ConvertSkiatoRGB(const unsigned char* skia, int pixel_width,
     int alpha = SkGetPackedA32(pixel_in);
     if (alpha != 0 && alpha != 255) {
       SkColor unmultiplied = SkUnPreMultiply::PMColorToColor(pixel_in);
-      pixel_out[0] = SkColorGetR(unmultiplied);
-      pixel_out[1] = SkColorGetG(unmultiplied);
-      pixel_out[2] = SkColorGetB(unmultiplied);
+      pixel_out[0] = SkGetPackedR32(unmultiplied);
+      pixel_out[1] = SkGetPackedG32(unmultiplied);
+      pixel_out[2] = SkGetPackedB32(unmultiplied);

[tony, 2012/07/26 17:38:21]

Since the else block does the same as this, I would restructure this code to:

if (alpha != 0 && alpha != 255) {
  pixel_in = SkUnPreMultiply::PMColorToColor(pixel_in);
pixel_out[0] = SkGetPackedR32(pixel_in);
pixel_out[1] = SkGetPackedG32(pixel_in);
pixel_out[2] = SkGetPackedB32(pixel_in);

     } else {
       pixel_out[0] = SkGetPackedR32(pixel_in);
       pixel_out[1] = SkGetPackedG32(pixel_in);