ui: Remove a bunch of uses of gfx::Canvas::ExtractImageRep()

chrome/browser/ui/app_list/extension_app_item.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/ui/app_list/extension_app_item.h"
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "build/build_config.h"
@@ skipping 14 matching lines @@
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_icon_set.h"
 #include "extensions/common/manifest_handlers/icons_handler.h"
 #include "extensions/common/manifest_url_handlers.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/event_constants.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/image/canvas_image_source.h"
+#include "ui/gfx/skia_util.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/extensions/gfx_utils.h"
 #endif
 
 using extensions::Extension;
 
 namespace {
 
 // Overlays a shortcut icon over the bottom left corner of a given image.
@@ skipping 29 matching lines @@
         icon_(icon) {
   }
   ~RoundedCornersImageSource() override {}
 
  private:
   // gfx::CanvasImageSource overrides:
   void Draw(gfx::Canvas* canvas) override {
     // The radius used to round the app icon.
     const size_t kRoundingRadius = 2;
 
+    SkBitmap mask_bitmap;

[Peter Kasting, 2017/03/20 22:49:21]

Nit: Trivial, but I liked having this block below the DrawImageInt() call
because it minimized the lifetimes of the temps in it.

[danakj, 2017/03/21 15:25:56]

Sure, done. I liked having all the calls to |canvas| together fwiw.

+    mask_bitmap.allocN32Pixels(icon_.width(), icon_.height(), false);
+    sk_sp<SkSurface> mask_surface = SkSurface::MakeRasterDirect(
+        mask_bitmap.info(), mask_bitmap.getPixels(), mask_bitmap.rowBytes());
+    mask_surface->getCanvas()->clear(SK_ColorTRANSPARENT);
+    SkPaint mask_paint;
+    mask_paint.setAntiAlias(true);
+    mask_paint.setColor(SK_ColorWHITE);
+    mask_surface->getCanvas()->drawRoundRect(
+        gfx::RectToSkRect(gfx::Rect(icon_.width(), icon_.height())),
+        kRoundingRadius, kRoundingRadius, mask_paint);
+
     canvas->DrawImageInt(icon_, 0, 0);
-
-    std::unique_ptr<gfx::Canvas> masking_canvas(
-        new gfx::Canvas(gfx::Size(icon_.width(), icon_.height()), 1.0f, false));
-    DCHECK(masking_canvas);
-
-    cc::PaintFlags opaque_flags;
-    opaque_flags.setAntiAlias(true);
-    opaque_flags.setColor(SK_ColorWHITE);
-    masking_canvas->DrawRoundRect(gfx::Rect(icon_.width(), icon_.height()),
-                                  kRoundingRadius, opaque_flags);
-
     cc::PaintFlags masking_flags;
     masking_flags.setBlendMode(SkBlendMode::kDstIn);
-    canvas->DrawImageInt(gfx::ImageSkia(masking_canvas->ExtractImageRep()), 0,
-                         0, masking_flags);
+    canvas->sk_canvas()->drawBitmap(mask_bitmap, 0, 0, &masking_flags);
   }
 
   gfx::ImageSkia icon_;
 
   DISALLOW_COPY_AND_ASSIGN(RoundedCornersImageSource);
 };
 
 }  // namespace
 
 ExtensionAppItem::ExtensionAppItem(
@@ skipping 196 matching lines @@
 // static
 const char ExtensionAppItem::kItemType[] = "ExtensionAppItem";
 
 const char* ExtensionAppItem::GetItemType() const {
   return ExtensionAppItem::kItemType;
 }
 
 void ExtensionAppItem::ExecuteLaunchCommand(int event_flags) {
   Launch(event_flags);
 }