From 74d597c7ae0348a78397f7493e9ef8386e151dff Mon Sep 17 00:00:00 2001 From: "pkotwicz@chromium.org" Date: Thu, 10 May 2012 15:47:00 +0000 Subject: Revert 136304 - This patch makes ImageSkia more like SkBitmap. The goal is to make swapping from SkBitmap to ImageSkia easier. Notable changes: - ImageSkia can be cheaply copied - Added extractSubset, will remove after SkBitmaps have been converted to ImageSkia - Modified API to look more like SkBitmap Review URL: https://chromiumcodereview.appspot.com/10245003 TBR=pkotwicz@chromium.org Review URL: https://chromiumcodereview.appspot.com/10383110 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136313 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/web_applications/web_app_mac.mm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'chrome/browser/web_applications') diff --git a/chrome/browser/web_applications/web_app_mac.mm b/chrome/browser/web_applications/web_app_mac.mm index 46ce5f5..bcc7991 100644 --- a/chrome/browser/web_applications/web_app_mac.mm +++ b/chrome/browser/web_applications/web_app_mac.mm @@ -198,9 +198,10 @@ bool WebAppShortcutCreator::UpdateIcon(const FilePath& app_path) const { scoped_nsobject icon_family([[IconFamily alloc] init]); bool image_added = false; - const std::vector bitmaps = info_.favicon.ToImageSkia()->bitmaps(); + const std::vector& bitmaps = + info_.favicon.ToImageSkia()->bitmaps(); for (size_t i = 0; i < bitmaps.size(); ++i) { - NSBitmapImageRep* image_rep = SkBitmapToImageRep(bitmaps[i]); + NSBitmapImageRep* image_rep = SkBitmapToImageRep(*bitmaps[i]); if (!image_rep) continue; -- cgit v1.1