chrome/browser/ui/views/frame/taskbar_decorator_win.cc - Issue 1406403007: Eliminate HICON leaks caused by creating icons from bitmap image.

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/ui/views/frame/taskbar_decorator_win.cc

Issue 1406403007: Eliminate HICON leaks caused by creating icons from bitmap image. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Use ScopedHICON instead of HICON. Created 5 years, 1 month ago

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

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/ui/views/frame/glass_browser_frame_view.cc ('K') | « chrome/browser/ui/views/frame/glass_browser_frame_view.cc ('k') | chrome/browser/ui/views/panels/panel_frame_view.cc » ('j') | ui/gfx/icon_util.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/frame/taskbar_decorator_win.cc

diff --git a/chrome/browser/ui/views/frame/taskbar_decorator_win.cc b/chrome/browser/ui/views/frame/taskbar_decorator_win.cc

index 8772dce1f62d7c5f483db74da348841290021ff4..f09d7903d7dc57eb6650037038e0c8f5f7dd7028 100644

--- a/chrome/browser/ui/views/frame/taskbar_decorator_win.cc

+++ b/chrome/browser/ui/views/frame/taskbar_decorator_win.cc

@@ -59,11 +59,11 @@ void SetOverlayIcon(HWND hwnd, scoped_ptr<SkBitmap> bitmap) {

SkCanvas offscreen_canvas(offscreen_bitmap);

offscreen_canvas.clear(SK_ColorTRANSPARENT);

offscreen_canvas.drawBitmap(sk_icon, 0, kOverlayIconSize - resized_height);

- icon.Set(IconUtil::CreateHICONFromSkBitmap(offscreen_bitmap));

- if (!icon.Get())

+ icon = IconUtil::CreateHICONFromSkBitmap(offscreen_bitmap).Pass();

+ if (!icon.is_valid())

return;

}

- taskbar->SetOverlayIcon(hwnd, icon, L"");

+ taskbar->SetOverlayIcon(hwnd, icon.get(), L"");

}

} // namespace