chrome/browser/extensions/image_loading_tracker.cc - Issue 10830123: crbug.com/124865 - DCHECK failure when pinning Chrome Web Store to Launcher

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/extensions/image_loading_tracker.cc

Issue 10830123: crbug.com/124865 - DCHECK failure when pinning Chrome Web Store to Launcher (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: add check (!resource.empty()) to ImageLoadingTracker 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:

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

Download patch

« no previous file with comments | « no previous file | chrome/browser/ui/views/ash/launcher/launcher_app_icon_loader.cc » ('j') | chrome/browser/ui/views/ash/launcher/launcher_app_icon_loader.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/image_loading_tracker.cc

diff --git a/chrome/browser/extensions/image_loading_tracker.cc b/chrome/browser/extensions/image_loading_tracker.cc

index ea84c34fe5dc55d490b8af4ea2a5971c38ecc3e1..02fd19bce02b7f5af03ea567368a1296649b24ed 100644

--- a/chrome/browser/extensions/image_loading_tracker.cc

+++ b/chrome/browser/extensions/image_loading_tracker.cc

@@ -311,7 +311,7 @@ void ImageLoadingTracker::OnImageLoaded(

// Add to the extension's image cache if requested.

DCHECK(info->cache != CACHE || info->extension);

- if (should_cache && info->cache == CACHE &&

+ if (should_cache && info->cache == CACHE && !resource.empty() &&

!info->extension->HasCachedImage(resource, original_size)) {

info->extension->SetCachedImage(resource, image ? *image : SkBitmap(),

original_size);