chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc - Issue 10837215: exhibit 1: explicit null checks

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/gtk/hung_renderer_dialog_gtk.cc

Issue 10837215: exhibit 1: explicit null checks Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 8 years, 4 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/ui/gtk/hung_renderer_dialog_gtk.cc

diff --git a/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc b/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc

index 8f24d10cea9a981f7bdfb9127c6151f3bf980645..f9565cd3e2c0d330c85f45d50c839885024e88cc 100644

--- a/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc

+++ b/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc

@@ -191,7 +191,8 @@ void HungRendererDialogGtk::ShowForWebContents(WebContents* hung_contents) {

std::string title = UTF16ToUTF8(it->web_contents()->GetTitle());

if (title.empty())

title = UTF16ToUTF8(CoreTabHelper::GetDefaultTitle());

- SkBitmap favicon = it->favicon_tab_helper()->GetFavicon().AsBitmap();

+ const gfx::Image& icon = it->favicon_tab_helper()->GetFavicon();

+ SkBitmap favicon = icon.IsEmpty() ? SkBitmap() : *icon.ToSkBitmap();

GdkPixbuf* pixbuf = NULL;

if (favicon.width() > 0)