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

ui/gfx/codec/png_codec.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gfx/codec/png_codec.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "ui/gfx/size.h"
@@ skipping 46 matching lines @@
 
 void ConvertSkiatoRGB(const unsigned char* skia, int pixel_width,
                       unsigned char* rgb, bool* is_opaque) {
   for (int x = 0; x < pixel_width; x++) {
     const uint32_t pixel_in = *reinterpret_cast<const uint32_t*>(&skia[x * 4]);
     unsigned char* pixel_out = &rgb[x * 3];
 
     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);
       pixel_out[2] = SkGetPackedB32(pixel_in);
     }
   }
 }
 
 void ConvertSkiatoRGBA(const unsigned char* skia, int pixel_width,
                        unsigned char* rgba, bool* is_opaque) {
@@ skipping 703 matching lines @@
 }
 
 PNGCodec::Comment::Comment(const std::string& k, const std::string& t)
     : key(k), text(t) {
 }
 
 PNGCodec::Comment::~Comment() {
 }
 
 }  // namespace gfx