Make generated hosted app icons have white background.

chrome/browser/extensions/tab_helper.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 "chrome/browser/extensions/tab_helper.h"
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 120 matching lines @@
   std::map<int, SkBitmap>::const_iterator it =
       bitmaps->lower_bound(output_size);
   // Do nothing if there is no icon smaller than the desired size or there is
   // already an icon of |output_size|.
   if (it == bitmaps->begin() || bitmaps->count(output_size))
     return;
 
   --it;
   // This is the biggest icon smaller than |output_size|.
   const SkBitmap& base_icon = it->second;
-  scoped_ptr<SkCanvas> canvas(
-      skia::CreateBitmapCanvas(output_size, output_size, false));
-  DCHECK(canvas);
 
   const size_t kBorderRadius = 5;
   const size_t kColorStripHeight = 3;
-  const size_t kColorStripRadius = 2;
   const SkColor kBorderColor = 0xFFD5D5D5;
+  const SkColor kBackgroundColor = 0xFFFFFFFF;
+
+  // Create a separate canvas for the color strip.
+  scoped_ptr<SkCanvas> color_strip_canvas(
+      skia::CreateBitmapCanvas(output_size, output_size, false));
+  DCHECK(color_strip_canvas);
 
   // Draw a rounded rect of the |base_icon|'s dominant color.
   SkPaint color_strip_paint;
   color_utils::GridSampler sampler;
   color_strip_paint.setFlags(SkPaint::kAntiAlias_Flag);
   color_strip_paint.setColor(
       color_utils::CalculateKMeanColorOfPNG(
           gfx::Image::CreateFrom1xBitmap(base_icon).As1xPNGBytes(),
           100, 665, &sampler));
-  canvas->drawRoundRect(
-      SkRect::MakeXYWH(1, 0, output_size - 2, output_size - 1),
-      kColorStripRadius, kColorStripRadius, color_strip_paint);
+  color_strip_canvas->drawRoundRect(
+      SkRect::MakeWH(output_size, output_size),
+      kBorderRadius, kBorderRadius, color_strip_paint);
 
   // Erase the top of the rounded rect to leave a color strip.
   SkPaint clear_paint;
   clear_paint.setColor(SK_ColorTRANSPARENT);
   clear_paint.setXfermodeMode(SkXfermode::kSrc_Mode);
-  canvas->drawRect(
-      SkRect::MakeWH(output_size, output_size - kColorStripHeight - 1),
+  color_strip_canvas->drawRect(
+      SkRect::MakeWH(output_size, output_size - kColorStripHeight),
       clear_paint);
 
+  // Draw each element to an output canvas.
+  scoped_ptr<SkCanvas> canvas(
+      skia::CreateBitmapCanvas(output_size, output_size, false));
+  DCHECK(canvas);
+
+  // Draw the background.
+  SkPaint background_paint;
+  background_paint.setColor(kBackgroundColor);
+  background_paint.setFlags(SkPaint::kAntiAlias_Flag);
+  canvas->drawRoundRect(
+      SkRect::MakeWH(output_size, output_size),
+      kBorderRadius, kBorderRadius, background_paint);
+
+  // Draw the color strip.
+  canvas->drawBitmap(color_strip_canvas->getDevice()->accessBitmap(false),
+                     0, 0);
+
   // Draw the border.
   SkPaint border_paint;
   border_paint.setColor(kBorderColor);
   border_paint.setStyle(SkPaint::kStroke_Style);
   border_paint.setFlags(SkPaint::kAntiAlias_Flag);
   canvas->drawRoundRect(
       SkRect::MakeWH(output_size, output_size),
       kBorderRadius, kBorderRadius, border_paint);
 
-  // Draw the centered base icon.
+  // Draw the centered base icon to the output canvas.
   canvas->drawBitmap(base_icon,
                      (output_size - base_icon.width()) / 2,
                      (output_size - base_icon.height()) / 2);
 
   const SkBitmap& generated_icon =
       canvas->getDevice()->accessBitmap(false);
   generated_icon.deepCopyTo(&(*bitmaps)[output_size],
                             generated_icon.getConfig());
 }
 
@@ skipping 592 matching lines @@
   }
 }
 
 void TabHelper::SetTabId(RenderViewHost* render_view_host) {
   render_view_host->Send(
       new ExtensionMsg_SetTabId(render_view_host->GetRoutingID(),
                                 SessionID::IdForTab(web_contents())));
 }
 
 }  // namespace extensions