corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1169680 - Don't merge image cache entries for blob URIs with different refs. r=tn

Browse Source
This commit is contained in:
Seth Fowler
2015-06-05 01:52:06 -07:00
parent ee69b02b24
commit 06659fcff7
7 changed files with 99 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
image/ImageCacheKey.cpp
View File

@@ -86,8 +86,10 @@ bool
ImageCacheKey::operator==(const ImageCacheKey& aOther) const
{
if (mBlobSerial || aOther.mBlobSerial) {
// If at least one of us has a blob serial, just compare those.
return mBlobSerial == aOther.mBlobSerial;
// If at least one of us has a blob serial, just compare the blob serial and
// the ref portion of the URIs.
return mBlobSerial == aOther.mBlobSerial &&
mURI->HasSameRef(*aOther.mURI);
}
// For non-blob URIs, compare the URIs.
@@ -109,8 +111,13 @@ ImageCacheKey::ComputeHash(ImageURL* aURI,
if (aBlobSerial) {
// For blob URIs, we hash the serial number of the underlying blob, so that
// different blob URIs which point to the same blob share a cache entry.
return HashGeneric(*aBlobSerial);
// different blob URIs which point to the same blob share a cache entry. We
// also include the ref portion of the URI to support -moz-samplesize and
// -moz-resolution, which require us to create different Image objects even
// if the source data is the same.
nsAutoCString ref;
aURI->GetRef(ref);
return HashGeneric(*aBlobSerial, HashString(ref));
}
// For non-blob URIs, we hash the URI spec.