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

Backed out changeset dd25b4d148af (bug 1139641) for bustage on a CLOSED TREE

Browse Source
This commit is contained in:
Carsten "Tomcat" Book
2015-06-03 08:51:36 +02:00
parent 4257286fa8
commit 86a15400bf
8 changed files with 76 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
image/SurfaceCache.cpp
View File

@@ -25,7 +25,6 @@
#include "gfxPrefs.h"
#include "imgFrame.h"
#include "Image.h"
#include "LookupResult.h"
#include "nsAutoPtr.h"
#include "nsExpirationTracker.h"
#include "nsHashKeys.h"
@@ -544,17 +543,17 @@ public:
"More available cost than we started with");
}
LookupResult Lookup(const ImageKey aImageKey,
const SurfaceKey& aSurfaceKey)
DrawableFrameRef Lookup(const ImageKey aImageKey,
const SurfaceKey& aSurfaceKey)
{
nsRefPtr<ImageSurfaceCache> cache = GetImageCache(aImageKey);
if (!cache) {
return LookupResult(); // No cached surfaces for this image.
return DrawableFrameRef(); // No cached surfaces for this image.
}
nsRefPtr<CachedSurface> surface = cache->Lookup(aSurfaceKey);
if (!surface) {
return LookupResult(); // Lookup in the per-image cache missed.
return DrawableFrameRef(); // Lookup in the per-image cache missed.
}
DrawableFrameRef ref = surface->DrawableRef();
@@ -562,7 +561,7 @@ public:
// The surface was released by the operating system. Remove the cache
// entry as well.
Remove(surface);
return LookupResult();
return DrawableFrameRef();
}
if (cache->IsLocked()) {
@@ -571,16 +570,16 @@ public:
mExpirationTracker.MarkUsed(surface);
}
return LookupResult(Move(ref), /* aIsExactMatch = */ true);
return ref;
}
LookupResult LookupBestMatch(const ImageKey aImageKey,
const SurfaceKey& aSurfaceKey,
const Maybe<uint32_t>& aAlternateFlags)
DrawableFrameRef LookupBestMatch(const ImageKey aImageKey,
const SurfaceKey& aSurfaceKey,
const Maybe<uint32_t>& aAlternateFlags)
{
nsRefPtr<ImageSurfaceCache> cache = GetImageCache(aImageKey);
if (!cache) {
return LookupResult(); // No cached surfaces for this image.
return DrawableFrameRef(); // No cached surfaces for this image.
}
// Repeatedly look up the best match, trying again if the resulting surface
@@ -594,7 +593,7 @@ public:
while (true) {
surface = cache->LookupBestMatch(aSurfaceKey, aAlternateFlags);
if (!surface) {
return LookupResult(); // Lookup in the per-image cache missed.
return DrawableFrameRef(); // Lookup in the per-image cache missed.
}
ref = surface->DrawableRef();
@@ -613,15 +612,7 @@ public:
mExpirationTracker.MarkUsed(surface);
}
SurfaceKey key = surface->GetSurfaceKey();
const bool isExactMatch = key.Size() == aSurfaceKey.Size();
MOZ_ASSERT(isExactMatch ==
(key == aSurfaceKey ||
(aAlternateFlags && key == aSurfaceKey.WithNewFlags(*aAlternateFlags))),
"Result differs in a way other than size or alternate flags");
return LookupResult(Move(ref), isExactMatch);
return ref;
}
void RemoveSurface(const ImageKey aImageKey,
@@ -979,34 +970,34 @@ SurfaceCache::Shutdown()
sInstance = nullptr;
}
/* static */ LookupResult
/* static */ DrawableFrameRef
SurfaceCache::Lookup(const ImageKey aImageKey,
const SurfaceKey& aSurfaceKey,
const Maybe<uint32_t>& aAlternateFlags /* = Nothing() */)
{
if (!sInstance) {
return LookupResult();
return DrawableFrameRef();
}
MutexAutoLock lock(sInstance->GetMutex());
LookupResult result = sInstance->Lookup(aImageKey, aSurfaceKey);
if (!result && aAlternateFlags) {
result = sInstance->Lookup(aImageKey,
aSurfaceKey.WithNewFlags(*aAlternateFlags));
DrawableFrameRef ref = sInstance->Lookup(aImageKey, aSurfaceKey);
if (!ref && aAlternateFlags) {
ref = sInstance->Lookup(aImageKey,
aSurfaceKey.WithNewFlags(*aAlternateFlags));
}
return result;
return ref;
}
/* static */ LookupResult
/* static */ DrawableFrameRef
SurfaceCache::LookupBestMatch(const ImageKey aImageKey,
const SurfaceKey& aSurfaceKey,
const Maybe<uint32_t>& aAlternateFlags
/* = Nothing() */)
{
if (!sInstance) {
return LookupResult();
return DrawableFrameRef();
}
MutexAutoLock lock(sInstance->GetMutex());