Eliminate a circular dependency by making BGRAToRGBA() generic...

base/gfx/gtk_util.cc

 // Copyright (c) 2009 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 "base/gfx/gtk_util.h"
 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 #include <stdlib.h>
 
 #include "base/gfx/rect.h"
 
 namespace gfx {
 
 const GdkColor kGdkWhite = GDK_COLOR_RGB(0xff, 0xff, 0xff);
 const GdkColor kGdkBlack = GDK_COLOR_RGB(0x00, 0x00, 0x00);
 const GdkColor kGdkGreen = GDK_COLOR_RGB(0x00, 0xff, 0x00);
 
 void SubtractRectanglesFromRegion(GdkRegion* region,
                                   const std::vector<Rect>& cutouts) {
   for (size_t i = 0; i < cutouts.size(); ++i) {
     GdkRectangle rect = cutouts[i].ToGdkRectangle();
     GdkRegion* rect_region = gdk_region_rectangle(&rect);
     gdk_region_subtract(region, rect_region);
     // TODO(deanm): It would be nice to be able to reuse the GdkRegion here.
     gdk_region_destroy(rect_region);
   }
 }
 
-uint8_t* BGRAToRGBA(const uint8_t* pixels, int width, int height, int stride) {
-  if (stride == 0)
-    stride = width * 4;
-
-  guchar* new_pixels = static_cast<guchar*>(malloc(height * stride));
-
-  // We have to copy the pixels and swap from BGRA to RGBA.
-  for (int i = 0; i < height; ++i) {
-    for (int j = 0; j < width; ++j) {
-      int idx = i * stride + j * 4;
-      new_pixels[idx] = pixels[idx + 2];
-      new_pixels[idx + 1] = pixels[idx + 1];
-      new_pixels[idx + 2] = pixels[idx];
-      new_pixels[idx + 3] = pixels[idx + 3];
-    }
-  }
-
-  return new_pixels;
-}
-
 }  // namespace gfx