Revert of Remove FORMAT_RGB from gfx::PngCodec

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 <stdint.h>
 
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 188 matching lines @@
     input_has_alpha = true;
   }
 
   // Convert 16-bit to 8-bit.
   if (bit_depth == 16)
     png_set_strip_16(png_ptr);
 
   // Pick our row format converter necessary for this data.
   if (!input_has_alpha) {
     switch (state->output_format) {
+      case PNGCodec::FORMAT_RGB:
+        state->output_channels = 3;
+        break;
       case PNGCodec::FORMAT_RGBA:
         state->output_channels = 4;
         png_set_add_alpha(png_ptr, 0xFF, PNG_FILLER_AFTER);
         break;
       case PNGCodec::FORMAT_BGRA:
         state->output_channels = 4;
         png_set_bgr(png_ptr);
         png_set_add_alpha(png_ptr, 0xFF, PNG_FILLER_AFTER);
         break;
       case PNGCodec::FORMAT_SkBitmap:
         state->output_channels = 4;
         png_set_add_alpha(png_ptr, 0xFF, PNG_FILLER_AFTER);
         break;
     }
   } else {
     switch (state->output_format) {
+      case PNGCodec::FORMAT_RGB:
+        state->output_channels = 3;
+        png_set_strip_alpha(png_ptr);
+        break;
       case PNGCodec::FORMAT_RGBA:
         state->output_channels = 4;
         break;
       case PNGCodec::FORMAT_BGRA:
         state->output_channels = 4;
         png_set_bgr(png_ptr);
         break;
       case PNGCodec::FORMAT_SkBitmap:
         state->output_channels = 4;
         break;
@@ skipping 385 matching lines @@
                                 const std::vector<PNGCodec::Comment>& comments,
                                 int compression_level,
                                 std::vector<unsigned char>* output) {
   // Run to convert an input row into the output row format, NULL means no
   // conversion is necessary.
   FormatConverter converter = NULL;
 
   int input_color_components, output_color_components;
   int png_output_color_type;
   switch (format) {
+    case PNGCodec::FORMAT_RGB:
+      input_color_components = 3;
+      output_color_components = 3;
+      png_output_color_type = PNG_COLOR_TYPE_RGB;
+      break;
+
     case PNGCodec::FORMAT_RGBA:
       input_color_components = 4;
       if (discard_transparency) {
         output_color_components = 3;
         png_output_color_type = PNG_COLOR_TYPE_RGB;
         converter = ConvertRGBAtoRGB;
       } else {
         output_color_components = 4;
         png_output_color_type = PNG_COLOR_TYPE_RGB_ALPHA;
         converter = NULL;
@@ skipping 143 matching lines @@
 }
 
 PNGCodec::Comment::Comment(const std::string& k, const std::string& t)
     : key(k), text(t) {
 }
 
 PNGCodec::Comment::~Comment() {
 }
 
 }  // namespace gfx