wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

bug 1030829 part 1 - support 'persistent' entries that will not be flushed from the user-font cache. r=roc

Browse Source
This commit is contained in:
Jonathan Kew 2014-06-30 19:05:28 +01:00
parent 1260837fc4
commit e0858e3e74
2 changed files with 44 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gfx/thebes/gfxUserFontSet.cpp
View File

@ -828,6 +828,14 @@ nsTHashtable<gfxUserFontSet::UserFontCache::Entry>*
NS_IMPL_ISUPPORTS(gfxUserFontSet::UserFontCache::Flusher, nsIObserver)
PLDHashOperator
gfxUserFontSet::UserFontCache::Entry::RemoveUnlessPersistent(Entry* aEntry,
void* aUserData)
{
return aEntry->mPersistence == kPersistent ? PL_DHASH_NEXT :
PL_DHASH_REMOVE;
}
PLDHashOperator
gfxUserFontSet::UserFontCache::Entry::RemoveIfPrivate(Entry* aEntry,
void* aUserData)
@ -861,7 +869,7 @@ gfxUserFontSet::UserFontCache::Flusher::Observe(nsISupports* aSubject,
}
if (!strcmp(aTopic, "cacheservice:empty-cache")) {
sUserFonts->Clear();
sUserFonts->EnumerateEntries(Entry::RemoveUnlessPersistent, nullptr);
} else if (!strcmp(aTopic, "last-pb-context-exited")) {
sUserFonts->EnumerateEntries(Entry::RemoveIfPrivate, nullptr);
} else if (!strcmp(aTopic, "xpcom-shutdown")) {
@ -919,7 +927,8 @@ gfxUserFontSet::UserFontCache::Entry::KeyEquals(const KeyTypePointer aKey) const
}
void
gfxUserFontSet::UserFontCache::CacheFont(gfxFontEntry *aFontEntry)
gfxUserFontSet::UserFontCache::CacheFont(gfxFontEntry *aFontEntry,
EntryPersistence aPersistence)
{
NS_ASSERTION(aFontEntry->mFamilyName.Length() != 0,
"caching a font associated with no family yet");
@ -948,7 +957,7 @@ gfxUserFontSet::UserFontCache::CacheFont(gfxFontEntry *aFontEntry)
principal = data->mPrincipal;
}
sUserFonts->PutEntry(Key(data->mURI, principal, aFontEntry,
data->mPrivate));
data->mPrivate, aPersistence));
#ifdef DEBUG_USERFONT_CACHE
printf("userfontcache added fontentry: %p\n", aFontEntry);

40
gfx/thebes/gfxUserFontSet.h
View File

@ -248,10 +248,21 @@ public:
class UserFontCache {
public:
// Flag passed when caching a font entry, to specify whether the entry
// should persist in the cache or be discardable.
typedef enum {
kDiscardable,
kPersistent
} EntryPersistence;
// Record a loaded user-font in the cache. This requires that the
// font-entry's userFontData has been set up already, as it relies
// on the URI and Principal recorded there.
static void CacheFont(gfxFontEntry *aFontEntry);
// If aPersistence is Persistent, the entry will remain in the cache
// across cacheservice:empty-cache notifications. This is used for
// "preloaded hidden fonts" on FxOS.
static void CacheFont(gfxFontEntry *aFontEntry,
EntryPersistence aPersistence = kDiscardable);
// The given gfxFontEntry is being destroyed, so remove any record that
// refers to it.
@ -298,13 +309,16 @@ public:
nsCOMPtr<nsIPrincipal> mPrincipal; // use nullptr with data: URLs
gfxFontEntry *mFontEntry;
bool mPrivate;
EntryPersistence mPersistence;
Key(nsIURI* aURI, nsIPrincipal* aPrincipal,
gfxFontEntry* aFontEntry, bool aPrivate)
gfxFontEntry* aFontEntry, bool aPrivate,
EntryPersistence aPersistence = kDiscardable)
: mURI(aURI),
mPrincipal(aPrincipal),
mFontEntry(aFontEntry),
mPrivate(aPrivate)
mPrivate(aPrivate),
mPersistence(aPersistence)
{ }
};
@ -317,14 +331,16 @@ public:
: mURI(aKey->mURI),
mPrincipal(aKey->mPrincipal),
mFontEntry(aKey->mFontEntry),
mPrivate(aKey->mPrivate)
mPrivate(aKey->mPrivate),
mPersistence(aKey->mPersistence)
{ }
Entry(const Entry& aOther)
: mURI(aOther.mURI),
mPrincipal(aOther.mPrincipal),
mFontEntry(aOther.mFontEntry),
mPrivate(aOther.mPrivate)
mPrivate(aOther.mPrivate),
mPersistence(aOther.mPersistence)
{ }
~Entry() { }
@ -352,9 +368,14 @@ public:
gfxFontEntry* GetFontEntry() const { return mFontEntry; }
static PLDHashOperator RemoveIfPrivate(Entry* aEntry, void* aUserData);
static PLDHashOperator RemoveIfMatches(Entry* aEntry, void* aUserData);
static PLDHashOperator DisconnectSVG(Entry* aEntry, void* aUserData);
static PLDHashOperator
RemoveUnlessPersistent(Entry* aEntry, void* aUserData);
static PLDHashOperator
RemoveIfPrivate(Entry* aEntry, void* aUserData);
static PLDHashOperator
RemoveIfMatches(Entry* aEntry, void* aUserData);
static PLDHashOperator
DisconnectSVG(Entry* aEntry, void* aUserData);
#ifdef DEBUG_USERFONT_CACHE
static PLDHashOperator DumpEntry(Entry* aEntry, void* aUserData);
@ -377,6 +398,9 @@ public:
// Whether this font was loaded from a private window.
bool mPrivate;
// Whether this entry should survive cache-flushing.
EntryPersistence mPersistence;
};
static nsTHashtable<Entry> *sUserFonts;