chrome/browser/web_applications/web_app_mac.mm - Issue 10245003: Makes ImageSkia more like SkBitmap

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/web_applications/web_app_mac.mm

Issue 10245003: Makes ImageSkia more like SkBitmap (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Nicer diff Created 8 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/web_applications/web_app_mac.mm

diff --git a/chrome/browser/web_applications/web_app_mac.mm b/chrome/browser/web_applications/web_app_mac.mm

index bcc7991e1a58ca84d51bb5334f0560cee095a6cb..88b32a842e01d00232a63791f91d0f29393c2ecc 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;