Replace Canvas::ExtractImageRep in render_view_context_menu.cc

chrome/browser/renderer_context_menu/render_view_context_menu.cc

 // Copyright 2014 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/renderer_context_menu/render_view_context_menu.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <set>
@@ skipping 99 matching lines @@
 #include "ppapi/features/features.h"
 #include "printing/features/features.h"
 #include "services/service_manager/public/cpp/interface_provider.h"
 #include "third_party/WebKit/public/public_features.h"
 #include "third_party/WebKit/public/web/WebContextMenuData.h"
 #include "third_party/WebKit/public/web/WebMediaPlayerAction.h"
 #include "third_party/WebKit/public/web/WebPluginAction.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/gfx/canvas.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/geometry/point.h"
-#include "ui/gfx/geometry/size.h"
-#include "ui/gfx/path.h"
 #include "ui/gfx/text_elider.h"
 
 #if !BUILDFLAG(USE_BROWSER_SPELLCHECKER)
 #include "chrome/browser/renderer_context_menu/spelling_options_submenu_observer.h"
 #endif
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
 #include "chrome/browser/extensions/devtools_util.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "extensions/browser/extension_host.h"
@@ skipping 300 matching lines @@
                 net::UnescapeRule::NONE, nullptr, nullptr, nullptr);
 
   ui::ScopedClipboardWriter scw(ui::CLIPBOARD_TYPE_COPY_PASTE);
   scw.WriteURL(text);
 }
 
 bool g_custom_id_ranges_initialized = false;
 
 #if !defined(OS_CHROMEOS)
 void AddAvatarToLastMenuItem(gfx::Image icon, ui::SimpleMenuModel* menu) {
+  // NOTE: On high dpi this will cause fuzzy output.
+  const float raster_scale = 1.f;
   int width = icon.Width();
   int height = icon.Height();
 
   // Don't try to scale too small icons.
   if (width < 16 || height < 16)
     return;
 
   // Profile avatars are supposed to be displayed with a circular mask, so apply
   // one.
-  gfx::Path circular_mask;
-  gfx::Canvas canvas(icon.Size(), 1.0f, true);
-  canvas.FillRect(gfx::Rect(icon.Size()), SK_ColorTRANSPARENT,
-                  SkBlendMode::kClear);
+  SkBitmap bitmap;
+  bitmap.allocN32Pixels(width, height, false /* opaque */);
+  SkCanvas canvas(bitmap);
+
+  canvas.clear(SK_ColorTRANSPARENT);
+
+  SkPath circular_mask;
   circular_mask.addCircle(SkIntToScalar(width) / 2, SkIntToScalar(height) / 2,
                           SkIntToScalar(std::min(width, height)) / 2);
-  canvas.ClipPath(circular_mask, true);
-  canvas.DrawImageInt(*icon.ToImageSkia(), 0, 0);
+  canvas.clipPath(circular_mask, true /* antialias */);
+
+  const gfx::ImageSkiaRep& rep =
+      icon.ToImageSkia()->GetRepresentation(raster_scale);

[Peter Kasting, 2017/03/22 00:04:15]

Rather than used this fixed-scale representation, we should set the icon using a
custom ImageSkiaSource that can draw the correct representation at the desired
scale factor.

I don't know if you're familiar with those.  Basically, we need to implement a
class here that overrides ImageSkiaSource::GetImageForScale() to do effectively
what this code is currently doing, except that the scale factor will be passed
in and not fixed at 1.  This class can then be used to construct an ImageSkia
that will pull the correct scaled representation as needed, and cache it.

+  canvas.save();
+  canvas.scale(raster_scale / rep.scale(), raster_scale / rep.scale());
+  canvas.drawBitmap(rep.sk_bitmap(), 0, 0);
+  canvas.restore();
 
   gfx::CalculateFaviconTargetSize(&width, &height);

[danakj, 2017/03/22 14:41:42]

I had some trouble understanding if the width/height here and below are supposed
to be the bitmap px or dip. I will try some more.

   gfx::Image sized_icon = profiles::GetSizedAvatarIcon(
-      gfx::Image(gfx::ImageSkia(canvas.ExtractImageRep())), true, width,
-      height);
+      gfx::Image(gfx::ImageSkia(gfx::ImageSkiaRep(bitmap, raster_scale))), true,
+      width, height);
   menu->SetIcon(menu->GetItemCount() - 1, sized_icon);
 }
 #endif  // !defined(OS_CHROMEOS)
 
 // Adds Google icon to the last added menu item. Used for Google-powered
 // services like translate and search.
 void AddGoogleIconToLastMenuItem(ui::SimpleMenuModel* menu) {
 #if defined(GOOGLE_CHROME_BUILD)
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableGoogleBrandedContextMenu) ||
@@ skipping 2042 matching lines @@
 void RenderViewContextMenu::PluginActionAt(
     const gfx::Point& location,
     const WebPluginAction& action) {
   source_web_contents_->GetRenderViewHost()->
       ExecutePluginActionAtLocation(location, action);
 }
 
 Browser* RenderViewContextMenu::GetBrowser() const {
   return chrome::FindBrowserWithWebContents(embedder_web_contents_);
 }