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

ash/common/accelerators/debug_commands.cc

 // Copyright 2013 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 "ash/common/accelerators/debug_commands.h"
 
 #include "ash/common/accelerators/accelerator_commands.h"
 #include "ash/common/ash_switches.h"
 #include "ash/common/shell_delegate.h"
 #include "ash/common/system/toast/toast_data.h"
 #include "ash/common/system/toast/toast_manager.h"
 #include "ash/common/wallpaper/wallpaper_controller.h"
 #include "ash/common/wallpaper/wallpaper_delegate.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/wm/window_properties.h"
 #include "base/command_line.h"
 #include "base/metrics/user_metrics.h"
 #include "base/metrics/user_metrics_action.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/compositor/debug_utils.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
 #include "ui/views/debug_utils.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace debug {
 namespace {
 
 void HandlePrintLayerHierarchy() {
   for (WmWindow* root : WmShell::Get()->GetAllRootWindows()) {
     ui::Layer* layer = root->GetLayer();
@@ skipping 45 matching lines @@
     PrintWindowHierarchy(active_window, roots[i], 0, &out);
     // Error so logs can be collected from end-users.
     LOG(ERROR) << out.str();
   }
 }
 
 gfx::ImageSkia CreateWallpaperImage(SkColor fill, SkColor rect) {
   // TODO(oshima): Consider adding a command line option to control wallpaper
   // images for testing. The size is randomly picked.
   gfx::Size image_size(1366, 768);
-  gfx::Canvas canvas(image_size, 1.0f, true);
-  canvas.DrawColor(fill);
-  cc::PaintFlags flags;
-  flags.setColor(rect);
-  flags.setStrokeWidth(10);
-  flags.setStyle(cc::PaintFlags::kStroke_Style);
-  flags.setBlendMode(SkBlendMode::kSrcOver);
-  canvas.DrawRoundRect(gfx::Rect(image_size), 100, flags);
-  return gfx::ImageSkia(canvas.ExtractImageRep());
+  SkBitmap bitmap;
+  bitmap.allocN32Pixels(image_size.width(), image_size.height(), true);
+  sk_sp<SkSurface> surface = SkSurface::MakeRasterDirect(
+      bitmap.info(), bitmap.getPixels(), bitmap.rowBytes());
+  surface->getCanvas()->drawColor(fill);
+  SkPaint paint;
+  paint.setColor(rect);
+  paint.setStrokeWidth(10);
+  paint.setStyle(SkPaint::kStroke_Style);
+  paint.setBlendMode(SkBlendMode::kSrcOver);
+  surface->getCanvas()->drawRoundRect(gfx::RectToSkRect(gfx::Rect(image_size)),
+                                      100.f, 100.f, paint);
+  return gfx::ImageSkia(gfx::ImageSkiaRep(std::move(bitmap), 1.f));
 }
 
 void HandleToggleWallpaperMode() {
   static int index = 0;
   WallpaperController* wallpaper_controller =
       Shell::GetInstance()->wallpaper_controller();
   switch (++index % 4) {
     case 0:
       Shell::Get()->wallpaper_delegate()->InitializeWallpaper();
       break;
@@ skipping 95 matching lines @@
     case DEBUG_TRIGGER_CRASH:
       HandleTriggerCrash();
       break;
     default:
       break;
   }
 }
 
 }  // namespace debug
 }  // namespace ash