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

chrome/browser/ui/webui/app_launcher_login_handler.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/webui/app_launcher_login_handler.h"
 
 #include <stddef.h>
 
 #include <string>
 
@@ skipping 28 matching lines @@
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/common/page_zoom.h"
 #include "net/base/escape.h"
 #include "skia/ext/image_operations.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/webui/web_ui_util.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
+#include "ui/gfx/skia_util.h"
 
 using content::OpenURLParams;
 using content::Referrer;
 
 namespace {
 
 SkBitmap GetGAIAPictureForNTP(const gfx::Image& image) {
   // This value must match the width and height value of login-status-icon
   // in new_tab.css.
   const int kLength = 27;
   SkBitmap bmp = skia::ImageOperations::Resize(*image.ToSkBitmap(),
       skia::ImageOperations::RESIZE_BEST, kLength, kLength);
 
-  gfx::Canvas canvas(gfx::Size(kLength, kLength), 1.0f, false);
-  canvas.DrawImageInt(gfx::ImageSkia::CreateFrom1xBitmap(bmp), 0, 0);
-
   // Draw a gray border on the inside of the icon.
-  SkColor color = SkColorSetARGB(83, 0, 0, 0);
-  canvas.DrawRect(gfx::Rect(0, 0, kLength - 1, kLength - 1), color);
-
-  return canvas.ExtractImageRep().sk_bitmap();
+  sk_sp<SkSurface> surface =
+      SkSurface::MakeRasterDirect(bmp.info(), bmp.getPixels(), bmp.rowBytes());
+  SkPaint paint;
+  paint.setColor(SkColorSetARGB(83, 0, 0, 0));
+  paint.setStyle(SkPaint::kStroke_Style);
+  surface->getCanvas()->drawRect(
+      gfx::RectToSkRect(gfx::Rect(kLength - 1, kLength - 1)), paint);
+  return bmp;
 }
 
 // Puts the |content| into an element with the given CSS class.
 base::string16 CreateElementWithClass(const base::string16& content,
                                       const std::string& tag_name,
                                       const std::string& css_class,
                                       const std::string& extends_tag) {
   base::string16 start_tag = base::ASCIIToUTF16("<" + tag_name +
       " class='" + css_class + "' is='" + extends_tag + "'>");
   base::string16 end_tag = base::ASCIIToUTF16("</" + tag_name + ">");
@@ skipping 174 matching lines @@
   values->SetString("login_status_message", message);
   values->SetString("login_status_url",
       hide_sync ? std::string() : chrome::kSyncLearnMoreURL);
   values->SetString("login_status_advanced",
       hide_sync ? base::string16() :
       l10n_util::GetStringUTF16(IDS_SYNC_PROMO_NTP_BUBBLE_ADVANCED));
   values->SetString("login_status_dismiss",
       hide_sync ? base::string16() :
       l10n_util::GetStringUTF16(IDS_SYNC_PROMO_NTP_BUBBLE_OK));
 }