diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 17:41:13 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 17:41:13 +0000 |
| commit | 89753fdf570d25d44fe9d5f01600fa5138ca1342 (patch) | |
| tree | be9814b040e47a28f25578073baaf3aacf673f78 /chrome/browser/web_applications | |
| parent | 8bd4a46da03767be3a2fa16c9fc32ed2233e47f7 (diff) | |
| download | chromium_src-89753fdf570d25d44fe9d5f01600fa5138ca1342.zip chromium_src-89753fdf570d25d44fe9d5f01600fa5138ca1342.tar.gz chromium_src-89753fdf570d25d44fe9d5f01600fa5138ca1342.tar.bz2 | |
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
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=136304
Review URL: https://chromiumcodereview.appspot.com/10245003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136332 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/web_applications')
| -rw-r--r-- | chrome/browser/web_applications/web_app_mac.mm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/web_applications/web_app_mac.mm b/chrome/browser/web_applications/web_app_mac.mm index bcc7991..46ce5f5 100644 --- a/chrome/browser/web_applications/web_app_mac.mm +++ b/chrome/browser/web_applications/web_app_mac.mm @@ -198,10 +198,9 @@ bool WebAppShortcutCreator::UpdateIcon(const FilePath& app_path) const { scoped_nsobject<IconFamily> icon_family([[IconFamily alloc] init]); bool image_added = false; - const std::vector<const SkBitmap*>& bitmaps = - info_.favicon.ToImageSkia()->bitmaps(); + const std::vector<SkBitmap> 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; |