chrome/browser/ui/views/hung_renderer_view.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/views/hung_renderer_view.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/views/hung_renderer_view.cc

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

index d1f21fbf24ce36c042a954df3aaf37d519fbc069..a6e0cd4d71db8887086e3297be717eefcbd06de3 100644

--- a/chrome/browser/ui/views/hung_renderer_view.cc

+++ b/chrome/browser/ui/views/hung_renderer_view.cc

@@ -120,7 +120,9 @@ string16 HungPagesTableModel::GetText(int row, int column_id) {

gfx::ImageSkia HungPagesTableModel::GetIcon(int row) {

DCHECK(row >= 0 && row < RowCount());

- return tab_observers_[row]->favicon_tab_helper()->GetFavicon().AsImageSkia();

+ const gfx::Image& icon =

+ tab_observers_[row]->favicon_tab_helper()->GetFavicon();

+ return icon.IsEmpty() ? gfx::ImageSkia() : *icon.ToImageSkia();

}

void HungPagesTableModel::SetObserver(ui::TableModelObserver* observer) {