chrome/browser/ui/gtk/tabs/tab_renderer_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/tabs/tab_renderer_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/tabs/tab_renderer_gtk.cc

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

index 7b9dcbdd08e775e08d15ca65081de90ef3d34f08..e227097011fa1487c20e7e1c470ff22463f4753d 100644

--- a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc

+++ b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc

@@ -337,8 +337,8 @@ void TabRendererGtk::UpdateData(WebContents* contents,

if (app_icon) {

data_.favicon = *app_icon;

} else {

- data_.favicon =

- tab_contents->favicon_tab_helper()->GetFavicon().AsBitmap();

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

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

}

data_.app = app;