chrome/browser/media/webrtc/window_icon_util_win.cc - Issue 2617153002: Bug Fix: Crash When Getting Window Icon

Side by Side Diff

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

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

Side by Side Diff: chrome/browser/media/webrtc/window_icon_util_win.cc

Issue 2617153002: Bug Fix: Crash When Getting Window Icon (Closed)

Patch Set: Created 3 years, 11 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:

« no previous file with comments | « no previous file | no next file » | no next file with comments »

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/media/webrtc/window_icon_util.h"	5 #include "chrome/browser/media/webrtc/window_icon_util.h"

6	6

7 #include "ui/gfx/icon_util.h"	7 #include "ui/gfx/icon_util.h"

8	8

9 gfx::ImageSkia GetWindowIcon(content::DesktopMediaID id) {	9 gfx::ImageSkia GetWindowIcon(content::DesktopMediaID id) {

10 DCHECK(id.type == content::DesktopMediaID::TYPE_WINDOW);	10 DCHECK(id.type == content::DesktopMediaID::TYPE_WINDOW);

(...skipping 18 matching lines...) Expand all Loading...
29	29

30 if (!icon_handle)	30 if (!icon_handle)

31 icon_handle = reinterpret_cast<HICON>(GetClassLongPtr(hwnd, GCLP_HICONSM));	31 icon_handle = reinterpret_cast<HICON>(GetClassLongPtr(hwnd, GCLP_HICONSM));

32	32

33 if (!icon_handle)	33 if (!icon_handle)

34 return gfx::ImageSkia();	34 return gfx::ImageSkia();

35	35

36 std::unique_ptr<SkBitmap> icon_bitmap(	36 std::unique_ptr<SkBitmap> icon_bitmap(

37 IconUtil::CreateSkBitmapFromHICON(icon_handle));	37 IconUtil::CreateSkBitmapFromHICON(icon_handle));

38	38

	39 if (!icon_bitmap)

	40 return gfx::ImageSkia();

	41

39 return gfx::ImageSkia::CreateFrom1xBitmap(*icon_bitmap);	42 return gfx::ImageSkia::CreateFrom1xBitmap(*icon_bitmap);

40 }	43 }

OLD	NEW