diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-14 22:34:00 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-14 22:34:00 +0000 |
| commit | a68c660bd1bcfa93d9759bdac2b384587e911c04 (patch) | |
| tree | a86770745fca2a96f61e1ef9499417c073993748 /chrome/browser/web_applications | |
| parent | 75af2a115ef599f4c26cd47a8cc336124ecffe52 (diff) | |
| download | chromium_src-a68c660bd1bcfa93d9759bdac2b384587e911c04.zip chromium_src-a68c660bd1bcfa93d9759bdac2b384587e911c04.tar.gz chromium_src-a68c660bd1bcfa93d9759bdac2b384587e911c04.tar.bz2 | |
Revert 136332 - 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
TBR=pkotwicz@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10389132
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136995 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, 3 insertions, 2 deletions
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<IconFamily> icon_family([[IconFamily alloc] init]); bool image_added = false; - const std::vector<SkBitmap> bitmaps = info_.favicon.ToImageSkia()->bitmaps(); + const std::vector<const 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; |