Revert r135533.

ui/gfx/skia_util.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/skia_util.h"
 
 #include "base/i18n/char_iterator.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColorPriv.h"
 #include "third_party/skia/include/core/SkShader.h"
-#include "third_party/skia/include/core/SkUnPreMultiply.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/gfx/rect.h"
 
 namespace gfx {
 
 SkRect RectToSkRect(const gfx::Rect& rect) {
   SkRect r;
   r.iset(rect.x(), rect.y(), rect.right(), rect.bottom());
   return r;
 }
@@ skipping 73 matching lines @@
   }
 
   if (accelerated_char_pos)
     *accelerated_char_pos = last_char_pos;
   if (accelerated_char_span)
     *accelerated_char_span = last_char_span;
 
   return accelerator_removed;
 }
 
-void ConvertSkiaToRGBA(const unsigned char* skia,
-                       int pixel_width,
-                       unsigned char* rgba) {
-  int total_length = pixel_width * 4;
-  for (int i = 0; i < total_length; i += 4) {
-    const uint32_t pixel_in = *reinterpret_cast<const uint32_t*>(&skia[i]);
-
-    // Pack the components here.
-    int alpha = SkGetPackedA32(pixel_in);
-    if (alpha != 0 && alpha != 255) {
-      SkColor unmultiplied = SkUnPreMultiply::PMColorToColor(pixel_in);
-      rgba[i + 0] = SkColorGetR(unmultiplied);
-      rgba[i + 1] = SkColorGetG(unmultiplied);
-      rgba[i + 2] = SkColorGetB(unmultiplied);
-      rgba[i + 3] = alpha;
-    } else {
-      rgba[i + 0] = SkGetPackedR32(pixel_in);
-      rgba[i + 1] = SkGetPackedG32(pixel_in);
-      rgba[i + 2] = SkGetPackedB32(pixel_in);
-      rgba[i + 3] = alpha;
-    }
-  }
-}
-
 }  // namespace gfx