diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-31 20:48:33 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-31 20:48:33 +0000 |
| commit | 4f30638aceaf44af1d12cca32a2c39dbcca48bd9 (patch) | |
| tree | 8cddf629231a3ae714f4959635a31b46cf8e5a3d /chrome/browser/extensions | |
| parent | abba1cee6f2790411e04f29f64d1a124b0f50d09 (diff) | |
| download | chromium_src-4f30638aceaf44af1d12cca32a2c39dbcca48bd9.zip chromium_src-4f30638aceaf44af1d12cca32a2c39dbcca48bd9.tar.gz chromium_src-4f30638aceaf44af1d12cca32a2c39dbcca48bd9.tar.bz2 | |
Fixes bug in ImageLoadintTracker where it would incorrectly hit a
DCHECK if the extension doesn't have an image for a particular
resource.
BUG=none
TEST=none
TBR=aa
Review URL: http://codereview.chromium.org/1559010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43255 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
| -rw-r--r-- | chrome/browser/extensions/image_loading_tracker.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/extensions/image_loading_tracker.cc b/chrome/browser/extensions/image_loading_tracker.cc index 2f7ef4d..6c38fb8 100644 --- a/chrome/browser/extensions/image_loading_tracker.cc +++ b/chrome/browser/extensions/image_loading_tracker.cc @@ -133,8 +133,6 @@ void ImageLoadingTracker::LoadImage(Extension* extension, const ExtensionResource& resource, const gfx::Size& max_size, CacheParam cache) { - DCHECK(extension->path() == resource.extension_root()); - // If we don't have a path we don't need to do any further work, just respond // back. int id = next_id_++; @@ -143,6 +141,8 @@ void ImageLoadingTracker::LoadImage(Extension* extension, return; } + DCHECK(extension->path() == resource.extension_root()); + // See if the extension has the image already. if (extension->HasCachedImage(resource)) { SkBitmap image = extension->GetCachedImage(resource); |