Convert extension action icons code to use ImageSkia instead of SkBitmap

chrome/browser/ui/cocoa/extensions/browser_action_button.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/logging.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h"
 #import "chrome/browser/ui/cocoa/image_utils.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia_paint.h"
 #include "ui/gfx/image/image.h"
+#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_util_mac.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 #include "ui/gfx/size.h"
 
 using extensions::Extension;
 
 NSString* const kBrowserActionButtonDraggingNotification =
     @"BrowserActionButtonDraggingNotification";
 NSString* const kBrowserActionButtonDragEndNotification =
     @"BrowserActionButtonDragEndNotification";
@@ skipping 27 matching lines @@
         this, chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_UPDATED,
         content::Source<ExtensionAction>(browser_action_));
   }
 
   ~ExtensionImageTrackerBridge() {}
 
   // ImageLoadingTracker::Observer implementation.
   void OnImageLoaded(const gfx::Image& image,
                      const std::string& extension_id,
                      int index) OVERRIDE {
-    browser_action_->CacheIcon(browser_action_->default_icon_path(), image);
+    browser_action_->CacheIcon(browser_action_->default_icon_path(),
+                               *image.ToImageSkia());
     [owner_ updateState];
   }
 
   // Overridden from content::NotificationObserver.
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) {
     if (type == chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_UPDATED)
       [owner_ updateState];
     else
@@ skipping 156 matching lines @@
   if (tabId_ < 0)
     return;
 
   std::string tooltip = extension_->browser_action()->GetTitle(tabId_);
   if (tooltip.empty()) {
     [self setToolTip:nil];
   } else {
     [self setToolTip:base::SysUTF8ToNSString(tooltip)];
   }
 
-  gfx::Image image = extension_->browser_action()->GetIcon(tabId_);
-  if (!image.IsEmpty())
-    [self setImage:image.ToNSImage()];
+  gfx::ImageSkia image = extension_->browser_action()->GetIcon(tabId_);
+  if (!image.empty())
+    [self setImage:gfx::NSImageFromImageSkia(image)];

[Robert Sesek, 2012/08/07 21:44:24]

Shouldn't this use gfx::Image because it's painting in the native format? You
should be able to stuff the ImageSkia from the extension into the Image and then
let it take care of the conversion.

[tbarzic, 2012/08/07 22:29:52]

wouldn't that do basically the same thing (convert image from ImageSkia
(encapsulated in gfx::Image) to NSImage; since browser_action()->GetIcon() will
always contains ImageSkia).

(I'm not completely sure I got this right :))

[Robert Sesek, 2012/08/08 16:02:06]

Yes, that's what it would do. We've standardized on gfx::Image as the way to
plumb an image that will be converted in the view layer to the platform type.
ImageSkia is really just a multi-resolution SkBitmap, which I think this should
stay gfx::Image.

[tbarzic, 2012/08/08 18:53:51]

OK then.. Done.

 
   [[self cell] setTabId:tabId_];
 
   bool enabled = extension_->browser_action()->GetIsVisible(tabId_);
   [self setEnabled:enabled ? YES : NO];
 
   [self setNeedsDisplay:YES];
 }
 
 - (BOOL)isAnimating {
@@ skipping 42 matching lines @@
 }
 
 - (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
   gfx::ScopedNSGraphicsContextSaveGState scopedGState;
   [super drawInteriorWithFrame:cellFrame inView:controlView];
   cellFrame.origin.y += kBrowserActionBadgeOriginYOffset;
   [self drawBadgeWithinFrame:cellFrame];
 }
 
 @end