Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-11 10:08:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset ccdc2beb09ae (bug 865929) for mochitest and crashtest crashes.

Browse Source 
CLOSED TREE
This commit is contained in:
Ryan VanderMeulen 2013-04-25 22:13:14 -04:00
parent 8323c4e569
commit 8365dff9bb
3 changed files with 1 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
b2g/app/b2g.js
View File

@ -28,7 +28,6 @@ pref("browser.cache.memory.capacity", 1024); // kilobytes
/* image cache prefs */
pref("image.cache.size", 1048576); // bytes
pref("image.high_quality_downscaling.enabled", false);
pref("canvas.image.cache.limit", 10485760); // 10 MB
/* offline cache prefs */
pref("browser.offline-apps.notify", false);

53
content/canvas/src/CanvasImageCache.cpp
View File

@ -13,7 +13,6 @@
#include "nsTHashtable.h"
#include "mozilla/dom/HTMLCanvasElement.h"
#include "nsContentUtils.h"
#include "mozilla/Preferences.h"
namespace mozilla {
@ -43,8 +42,6 @@ struct ImageCacheEntryData {
nsExpirationState* GetExpirationState() { return &mState; }
size_t SizeInBytes() { return mSize.width * mSize.height * 4; }
// Key
nsRefPtr<Element> mImage;
nsIImageLoadingContent* mILC;
@ -82,43 +79,19 @@ public:
nsAutoPtr<ImageCacheEntryData> mData;
};
static bool sPrefsInitialized = false;
static int32_t sCanvasImageCacheLimit = 0;
class ImageCache MOZ_FINAL : public nsExpirationTracker<ImageCacheEntryData,4>,
public nsIObserver {
class ImageCache MOZ_FINAL : public nsExpirationTracker<ImageCacheEntryData,4> {
public:
NS_DECL_ISUPPORTS
NS_DECL_NSIOBSERVER
// We use 3 generations of 1 second each to get a 2-3 seconds timeout.
enum { GENERATION_MS = 1000 };
ImageCache()
: nsExpirationTracker<ImageCacheEntryData,4>(GENERATION_MS)
, mSize(0)
{
if (!sPrefsInitialized) {
sPrefsInitialized = true;
Preferences::AddIntVarCache(&sCanvasImageCacheLimit, "canvas.image.cache.limit", 0);
}
mCache.Init();
}
~ImageCache() {
AgeAllGenerations();
}
void AddObject(ImageCacheEntryData* aObject)
{
nsExpirationTracker<ImageCacheEntryData,4>::AddObject(aObject);
mSize += aObject->SizeInBytes();
}
void RemoveObject(ImageCacheEntryData* aObject)
{
nsExpirationTracker<ImageCacheEntryData,4>::RemoveObject(aObject);
mSize -= aObject->SizeInBytes();
}
virtual void NotifyExpired(ImageCacheEntryData* aObject)
{
RemoveObject(aObject);
@ -127,24 +100,10 @@ public:
}
nsTHashtable<ImageCacheEntry> mCache;
size_t mSize;
};
static ImageCache* gImageCache = nullptr;
NS_IMPL_ISUPPORTS1(ImageCache, nsIObserver)
NS_IMETHODIMP
ImageCache::Observe(nsISupports *aSubject,
const char *aTopic,
const PRUnichar *aData)
{
if (strcmp(aTopic, "memory-pressure") == 0) {
AgeAllGenerations();
}
return NS_OK;
}
class CanvasImageCacheShutdownObserver MOZ_FINAL : public nsIObserver
{
public:
@ -161,9 +120,6 @@ CanvasImageCache::NotifyDrawImage(Element* aImage,
{
if (!gImageCache) {
gImageCache = new ImageCache();
nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
if (os)
os->AddObserver(gImageCache, "memory-pressure", false);
nsContentUtils::RegisterShutdownObserver(new CanvasImageCacheShutdownObserver());
}
@ -184,13 +140,6 @@ CanvasImageCache::NotifyDrawImage(Element* aImage,
entry->mData->mSurface = aSurface;
entry->mData->mSize = aSize;
}
if (!sCanvasImageCacheLimit)
return;
// Expire the image cache early if its larger than we want it to be.
while (gImageCache->mSize > size_t(sCanvasImageCacheLimit))
gImageCache->AgeOneGeneration();
}
gfxASurface*

4
modules/libpref/src/init/all.js
View File

@ -3921,10 +3921,6 @@ pref("image.multithreaded_decoding.enabled", true);
// automatically determined based on the system's number of cores.
pref("image.multithreaded_decoding.limit", -1);
// Limit for the canvas image cache. 0 means we don't limit the size of the
// cache.
pref("canvas.image.cache.limit", 0);
// WebGL prefs
pref("gl.msaa-level", 2);
pref("webgl.force-enabled", false);