mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
roytam1
dd0f21a905
- Bug 1169680 - Don't merge image cache entries for blob URIs with different refs. r=tn (e92302f2b) - pointer style (257a9dfea) - Bug 1136768 - Tidy detection of possibly relocated types r=terrence (8e3df5395) - Bug 1130640 - Don't unroll loops based on bounds using terms that have been discarded, r=jandem. (911c9b6ee) - Bug 1158131 - Add local resource whitelisting for string bundle channels. r=snorp (d05af5eef) - Bug 1153901 - Disable PlatformThread::SetName functions on builds with no SEH support. r=nfroyd (4d07581ba) - missing bit of Bug 1170124 - Remove unnecessary type monitoring (d6d882389) - pointer style (f6d3c6ae4) - Bug 1143966 - Remove type specifier from AllocKind to avoid miscompilations on GCC. r=terrence (44c061df3) - Bug 1052728 - Add telemetry to record GC phases that cause jank; r=sfink (f1e588798) - space and pointer style (51d4d5e46) - Bug 1118615 - Flash hangs displaying a camera/microphone access dialog in HiDPI mode, workaround. r=mstange (022d8139a) - Bug 1118615 - Flash hangs in HiDPI mode on OS X running peopleroulette app, fix comments. r=fix-comments (83b2c4852) - style cleanup (677ea587a) - Bug 1152661 - Fix -Wuninitialized warnings about Operand member variables. r=jandem (5a464818f) - align values to TenFourFox (48c2ac62b) - style (a60da64d0) - missing bit of Backout 7959ffacd30f (Bug 1176090) for being on top of a regression (be8e9cd57)
131 lines
3.2 KiB
C++
131 lines
3.2 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "ImageCacheKey.h"
|
|
|
|
#include "mozilla/Move.h"
|
|
#include "File.h"
|
|
#include "ImageURL.h"
|
|
#include "nsHostObjectProtocolHandler.h"
|
|
#include "nsString.h"
|
|
|
|
namespace mozilla {
|
|
|
|
using namespace dom;
|
|
|
|
namespace image {
|
|
|
|
bool
|
|
URISchemeIs(ImageURL* aURI, const char* aScheme)
|
|
{
|
|
bool schemeMatches = false;
|
|
if (NS_WARN_IF(NS_FAILED(aURI->SchemeIs(aScheme, &schemeMatches)))) {
|
|
return false;
|
|
}
|
|
return schemeMatches;
|
|
}
|
|
|
|
static Maybe<uint64_t>
|
|
BlobSerial(ImageURL* aURI)
|
|
{
|
|
nsAutoCString spec;
|
|
aURI->GetSpec(spec);
|
|
|
|
nsRefPtr<BlobImpl> blob;
|
|
if (NS_SUCCEEDED(NS_GetBlobForBlobURISpec(spec, getter_AddRefs(blob))) &&
|
|
blob) {
|
|
return Some(blob->GetSerialNumber());
|
|
}
|
|
|
|
return Nothing();
|
|
}
|
|
|
|
ImageCacheKey::ImageCacheKey(nsIURI* aURI)
|
|
: mURI(new ImageURL(aURI))
|
|
, mIsChrome(URISchemeIs(mURI, "chrome"))
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
if (URISchemeIs(mURI, "blob")) {
|
|
mBlobSerial = BlobSerial(mURI);
|
|
}
|
|
|
|
mHash = ComputeHash(mURI, mBlobSerial);
|
|
}
|
|
|
|
ImageCacheKey::ImageCacheKey(ImageURL* aURI)
|
|
: mURI(aURI)
|
|
, mIsChrome(URISchemeIs(mURI, "chrome"))
|
|
{
|
|
MOZ_ASSERT(aURI);
|
|
|
|
if (URISchemeIs(mURI, "blob")) {
|
|
mBlobSerial = BlobSerial(mURI);
|
|
}
|
|
|
|
mHash = ComputeHash(mURI, mBlobSerial);
|
|
}
|
|
|
|
ImageCacheKey::ImageCacheKey(const ImageCacheKey& aOther)
|
|
: mURI(aOther.mURI)
|
|
, mBlobSerial(aOther.mBlobSerial)
|
|
, mHash(aOther.mHash)
|
|
, mIsChrome(aOther.mIsChrome)
|
|
{ }
|
|
|
|
ImageCacheKey::ImageCacheKey(ImageCacheKey&& aOther)
|
|
: mURI(Move(aOther.mURI))
|
|
, mBlobSerial(Move(aOther.mBlobSerial))
|
|
, mHash(aOther.mHash)
|
|
, mIsChrome(aOther.mIsChrome)
|
|
{ }
|
|
|
|
bool
|
|
ImageCacheKey::operator==(const ImageCacheKey& aOther) const
|
|
{
|
|
if (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.
|
|
return *mURI == *aOther.mURI;
|
|
}
|
|
|
|
const char*
|
|
ImageCacheKey::Spec() const
|
|
{
|
|
return mURI->Spec();
|
|
}
|
|
|
|
/* static */ uint32_t
|
|
ImageCacheKey::ComputeHash(ImageURL* aURI,
|
|
const Maybe<uint64_t>& aBlobSerial)
|
|
{
|
|
// Since we frequently call Hash() several times in a row on the same
|
|
// ImageCacheKey, as an optimization we compute our hash once and store it.
|
|
|
|
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. 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.
|
|
nsAutoCString spec;
|
|
aURI->GetSpec(spec);
|
|
return HashString(spec);
|
|
}
|
|
|
|
} // namespace image
|
|
} // namespace mozilla
|