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

components/favicon/core/fallback_icon_service.cc

 // Copyright 2015 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 "components/favicon/core/fallback_icon_service.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
+#include "cc/paint/skia_paint_canvas.h"
 #include "components/favicon/core/fallback_icon_client.h"
 #include "components/favicon/core/fallback_url_util.h"
 #include "components/favicon_base/fallback_icon_style.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "url/gurl.h"
@@ skipping 12 matching lines @@
 }
 
 FallbackIconService::~FallbackIconService() {
 }
 
 std::vector<unsigned char> FallbackIconService::RenderFallbackIconBitmap(
     const GURL& icon_url,
     int size,
     const favicon_base::FallbackIconStyle& style) {
   int size_to_use = std::min(kMaxFallbackFaviconSize, size);
-  gfx::Canvas canvas(gfx::Size(size_to_use, size_to_use), 1.0f, false);
+  SkBitmap bitmap;
+  bitmap.allocN32Pixels(size_to_use, size_to_use, false);
+  cc::SkiaPaintCanvas paint_canvas(bitmap);
+  gfx::Canvas canvas(&paint_canvas, 1.f);
+
   DrawFallbackIcon(icon_url, size_to_use, style, &canvas);
 
   std::vector<unsigned char> bitmap_data;
-  if (!gfx::PNGCodec::EncodeBGRASkBitmap(canvas.ExtractImageRep().sk_bitmap(),
-                                         false, &bitmap_data)) {
+  if (!gfx::PNGCodec::EncodeBGRASkBitmap(bitmap, false, &bitmap_data))
     bitmap_data.clear();
-  }
   return bitmap_data;
 }
 
 void FallbackIconService::DrawFallbackIcon(
     const GURL& icon_url,
     int size,
     const favicon_base::FallbackIconStyle& style,
     gfx::Canvas* canvas) {
   const int kOffsetX = 0;
   const int kOffsetY = 0;
@@ skipping 17 matching lines @@
 
   canvas->DrawStringRectWithFlags(
       icon_text,
       gfx::FontList(fallback_icon_client_->GetFontNameList(), gfx::Font::NORMAL,
                     font_size, gfx::Font::Weight::NORMAL),
       style.text_color, gfx::Rect(kOffsetX, kOffsetY, size, size),
       gfx::Canvas::TEXT_ALIGN_CENTER);
 }
 
 }  // namespace favicon