From edb235df5f7689570f8222c82fd1becb78aad22f Mon Sep 17 00:00:00 2001
From: Mark Finkle <mfinkle@mozilla.com>
Date: Wed, 15 Jan 2014 21:02:07 -0500
Subject: [PATCH] Bug 959627 - BitmapUtils.getDominantColor can be expensive
 r=margaret

---
 mobile/android/base/gfx/BitmapUtils.java | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/mobile/android/base/gfx/BitmapUtils.java b/mobile/android/base/gfx/BitmapUtils.java
index 86e4339e21fe..16e5708ecee0 100644
--- a/mobile/android/base/gfx/BitmapUtils.java
+++ b/mobile/android/base/gfx/BitmapUtils.java
@@ -234,15 +234,19 @@ public final class BitmapUtils {
       float[] sumHue = new float[36];
       float[] sumSat = new float[36];
       float[] sumVal = new float[36];
+      float[] hsv = new float[3];
 
-      for (int row = 0; row < source.getHeight(); row++) {
-        for (int col = 0; col < source.getWidth(); col++) {
-          int c = source.getPixel(col, row);
+      int height = source.getHeight();
+      int width = source.getWidth();
+      int[] pixels = new int[width * height];
+      source.getPixels(pixels, 0, width, 0, 0, width, height);
+      for (int row = 0; row < height row++) {
+        for (int col = 0; col < width; col++) {
+          int c = pixels[col + row * width];
           // Ignore pixels with a certain transparency.
           if (Color.alpha(c) < 128)
             continue;
 
-          float[] hsv = new float[3];
           Color.colorToHSV(c, hsv);
 
           // If a threshold is applied, ignore arbitrarily chosen values for "white" and "black".
@@ -271,7 +275,6 @@ public final class BitmapUtils {
         return Color.argb(255,255,255,255);
 
       // Return a color with the average hue/saturation/value of the bin with the most colors.
-      float[] hsv = new float[3];
       hsv[0] = sumHue[maxBin]/colorBins[maxBin];
       hsv[1] = sumSat[maxBin]/colorBins[maxBin];
       hsv[2] = sumVal[maxBin]/colorBins[maxBin];