chrome/browser/views/location_bar_view.cc - Issue 165197: Merge 22213 - LocationBarView::PageActionImageView::LoadImageTask::Run() may ...

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/views/location_bar_view.cc

Issue 165197: Merge 22213 - LocationBarView::PageActionImageView::LoadImageTask::Run() may ... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/src/

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

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

Download patch

Index: chrome/browser/views/location_bar_view.cc

===================================================================

--- chrome/browser/views/location_bar_view.cc (revision 22844)

+++ chrome/browser/views/location_bar_view.cc (working copy)

@@ -1153,6 +1153,8 @@

}

void OnImageLoaded(SkBitmap* image, int index) {

+ if (image == NULL)

+ image = new SkBitmap();

if (view_)

view_->OnImageLoaded(image, index);

delete image;

Property changes on: chrome\browser\views\location_bar_view.cc

___________________________________________________________________

Modified: svn:mergeinfo

Merged /trunk/src/chrome/browser/views/location_bar_view.cc:r22213

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