Backed out changeset d0ddd9a98e74 (bug 1415961) for bustage in thebes. r=backout on a CLOSED TREE

This commit is contained in:
Sebastian Hengst 2017-11-10 00:11:59 +02:00
Родитель d553d84aeb
Коммит 8c31f6f143
2 изменённых файлов: 6 добавлений и 10 удалений

Просмотреть файл

@ -285,8 +285,6 @@ struct BlurCacheKey : public PLDHashEntryHdr {
, mInnerMinSize(aInnerMinSize)
{ }
BlurCacheKey(BlurCacheKey&&) = default;
static PLDHashNumber
HashKey(const KeyTypePointer aKey)
{
@ -346,10 +344,10 @@ struct BlurCacheKey : public PLDHashEntryHdr {
* to the cache entry to be able to be tracked by the nsExpirationTracker.
* */
struct BlurCacheData {
BlurCacheData(SourceSurface* aBlur, const IntMargin& aBlurMargin, BlurCacheKey&& aKey)
BlurCacheData(SourceSurface* aBlur, const IntMargin& aBlurMargin, const BlurCacheKey& aKey)
: mBlur(aBlur)
, mBlurMargin(aBlurMargin)
, mKey(Move(aKey))
, mKey(aKey)
{}
BlurCacheData(const BlurCacheData& aOther)
@ -508,7 +506,7 @@ CacheBlur(DrawTarget* aDT,
SourceSurface* aBoxShadow)
{
BlurCacheKey key(aMinSize, aBlurRadius, aCornerRadii, aShadowColor, aDT->GetBackendType());
BlurCacheData* data = new BlurCacheData(aBoxShadow, aBlurMargin, Move(key));
BlurCacheData* data = new BlurCacheData(aBoxShadow, aBlurMargin, key);
if (!gBlurCache->RegisterEntry(data)) {
delete data;
}
@ -1090,7 +1088,7 @@ CacheInsetBlur(const IntSize& aMinOuterSize,
aShadowColor, isInsetBlur,
aBackendType);
IntMargin blurMargin(0, 0, 0, 0);
BlurCacheData* data = new BlurCacheData(aBoxShadow, blurMargin, Move(key));
BlurCacheData* data = new BlurCacheData(aBoxShadow, blurMargin, key);
if (!gBlurCache->RegisterEntry(data)) {
delete data;
}

Просмотреть файл

@ -34,8 +34,6 @@ struct GradientCacheKey : public PLDHashEntryHdr {
: mStops(aOther->mStops), mExtend(aOther->mExtend), mBackendType(aOther->mBackendType)
{ }
GradientCacheKey(GradientCacheKey&& aOther) = default;
union FloatUint32
{
float f;
@ -88,9 +86,9 @@ struct GradientCacheKey : public PLDHashEntryHdr {
* to the cache entry to be able to be tracked by the nsExpirationTracker.
* */
struct GradientCacheData {
GradientCacheData(GradientStops* aStops, GradientCacheKey&& aKey)
GradientCacheData(GradientStops* aStops, const GradientCacheKey& aKey)
: mStops(aStops),
mKey(Move(aKey))
mKey(aKey)
{}
GradientCacheData(const GradientCacheData& aOther)