--- a/fontservices/fontstore/src/FNTSTORE.CPP Sat Feb 20 00:37:46 2010 +0200
+++ b/fontservices/fontstore/src/FNTSTORE.CPP Fri Mar 12 15:51:09 2010 +0200
@@ -35,10 +35,6 @@
#include <graphics/openfontrasterizer.h>
#include <graphics/openfontconstants.h>
-static const TUint32 KOutlineGlyphIdHashMask = 0x0000ffff;
-static const TUint32 KOutlineFileUidHashMask = 0x00ff0000;
-static const TUint32 KOutlineFaceIndexHashMask = 0x0f000000;
-static const TUint32 KOutlineFontPtrHashMask = 0x0fff0000;
// uncomment to enable some verbose debug prints
//#define VERBOSE_DEBUG 1
@@ -1111,185 +1107,6 @@
return NULL;
}
-/** Gets a font table.
-@param aTag: Input. The name of the font table.
-@param aTableContent: Output. To return the address of the table content.
-@param aLength: Output. To return the length (in bytes) of the table.
-@param aSessionHandle: Input. A handle to the session requesting this table.
-@return KErrNone on success, specific error code on failure.
-@internalTechnology
-*/
-EXPORT_C TInt CBitmapFont::GetFontTable(TUint32 aTag, TAny *&aTableContent,
- TInt &aLength, TInt aSessionHandle)
- {
- COpenFont *fontPtr = NULL;
- if (IsOpenFont())
- fontPtr = OpenFont();
- else
- return KErrNotSupported;
-
- // try to find it in cache.
- CFontStore *fntStore = fontPtr->File()->GetFontStore();
- TUid fileUid = fontPtr->File()->Uid();
- TInt ret = fntStore->FindFontTableInCache(fileUid, aTag, aTableContent, aLength);
- if (KErrNone == ret)
- {
- ret = fntStore->IncFontTableRefCount(fileUid, aTag, aSessionHandle);
- return ret;
- }
-
- // font table not found in cache.
- ret = fontPtr->GetFontTable(aTag, aTableContent, aLength);
- if (KErrNone == ret)
- {
- ret = fntStore->CacheFontTable(fileUid, aTag, aTableContent, aLength);
- if (KErrNone == ret)
- {
- ret = fntStore->IncFontTableRefCount(fileUid, aTag, aSessionHandle);
- }
- else
- {
- aTableContent = NULL;
- }
- }
-
- return ret;
- }
-
-/** Release a font table. Decrement its reference count. Remove from cache if
- * reference decreases to zero.
-@param aTag: Input. The name of the font table to be released.
-@param aSessionHandle: Input. Handle to the session releasing this table.
-@return KErrNone on success, specific error code on failure.
-@internalTechnology
-*/
-EXPORT_C void CBitmapFont::ReleaseFontTable(TUint32 aTag,
- TInt aSessionHandle)
- {
- COpenFont *fontPtr = NULL;
- if (IsOpenFont())
- fontPtr = OpenFont();
- else
- return;
-
- CFontStore *fntStore = fontPtr->File()->GetFontStore();
- TUid fileUid = fontPtr->File()->Uid();
- fntStore->ReleaseFontTable(fileUid, aTag, aSessionHandle);
- }
-
-
-/** Release a number of glyph outlines. Decrement their reference count.
- * Remove it from cache if reference count decreases to zero.
-@param aCount: Input. Number of outlines to be released.
-@param aCodes: Input. An array of codes. Its interpretation depends on the parameter
- 'aIsGlyphId' (see below).
-@param aIsGlyphId: Input. When aIsGlyphId==ETrue, 'aCodes' is an array of glyph ID's.
- When aIsGlyphId==EFalse, 'aCodes' is an array of Unicode values.
-@param aHinted: Input. To indicate if the outlines are hinted or unhinted.
-@param aSessionHandle: Input. Handle to the session releasing the outlines.
-@return KErrNone on success, specific error code on failure.
-@internalTechnology
-*/
-EXPORT_C void CBitmapFont::ReleaseGlyphOutlines(TInt aCount, const TUint *aCodes,
- TBool aHinted, TInt aSessionHandle)
- {
- COpenFont *fontPtr = NULL;
- if (IsOpenFont())
- fontPtr = OpenFont();
- else
- return;
-
- CFontStore *fontStore = fontPtr->File()->GetFontStore();
-
- for (TInt i = 0; i < aCount; ++i)
- {
- if (aHinted)
- {
- THintedOutlineId outlineId(fontPtr, aCodes[i]);
- fontStore->ReleaseHintedOutline(outlineId, aSessionHandle);
- }
- else
- {
- TInt faceId = fontPtr->FaceIndex();
- TUnhintedOutlineId outlineId(fontPtr->File()->Uid(), faceId, aCodes[i]);
- fontStore->ReleaseUnhintedOutline(outlineId, aSessionHandle);
- }
- }
- }
-
-/** Gets a font table.
-@param aCode: Input. An glyph code. Its interpretation depends on the parameter
- 'aIsGlyphId' (see below).
-@param aIsGlyphId: Input. When aIsGlyphId==ETrue, 'aCode' is a glyph ID.
- When aIsGlyphId==EFalse, 'aCode' is a Unicode values.
-@param aHinted: Input. To indicate if hinted or unhinted outline is needed.
-@param aOutline: Output. A 'void*' pointer, pointing to the outline in memory.
-@param aLength: Output. A TInt, recording the lenght (in bytes) of the outline.
-@param aSessionHandle: Input. Handle to the session requesting this outline.
-@return KErrNone on success, specific error code on failure.
-@internalTechnology
-*/
-EXPORT_C TInt CBitmapFont::GetGlyphOutline(TUint aCode,
- TBool aHinted, TAny *&aOutline, TInt &aLength, TInt aSessionHandle)
- {
- COpenFont *fontPtr = NULL;
- if (IsOpenFont())
- fontPtr = OpenFont();
- else
- return KErrNotSupported;
-
- CFontStore *fontStore = fontPtr->File()->GetFontStore();
- TAny *outlineData = NULL;
- TInt len = KErrGeneral;
- TInt ret = KErrNone;
- if (!aHinted)
- {
- TInt faceId = fontPtr->FaceIndex();
- TUnhintedOutlineId outlineId(fontPtr->File()->Uid(), faceId, aCode);
- ret = fontStore->FindUnhintedOutlineInCache(outlineId, outlineData, len);
- if (KErrNotFound == ret)
- {
- TAny* tmpOutline = 0;
- TInt tmpLen = 0;
- ret = fontPtr->GetGlyphOutline(aCode, aHinted, tmpOutline, tmpLen);
- if (KErrNone == ret)
- {
- fontStore->CacheUnhintedOutline(outlineId,
- tmpOutline, (TInt)tmpLen, outlineData, len);
- }
- User::Free(tmpOutline);
- }
- if (KErrNone == ret)
- {
- fontStore->IncreaseUnhintedOutlineRefCount(outlineId, aSessionHandle);
- }
- }
- else
- {
- THintedOutlineId outlineId(fontPtr, aCode);
- ret = fontStore->FindHintedOutlineInCache(outlineId, outlineData, len);
- if (KErrNotFound == ret)
- {
- TAny* tmpOutline = 0;
- TInt tmpLen = 0;
- ret = fontPtr->GetGlyphOutline(aCode, aHinted, tmpOutline, tmpLen);
- if (KErrNone == ret)
- {
- fontStore->CacheHintedOutline(outlineId,
- tmpOutline, (TInt)tmpLen, outlineData, len);
- }
- User::Free(tmpOutline);
- }
- if (KErrNone == ret)
- {
- fontStore->IncreaseHintedOutlineRefCount(outlineId, aSessionHandle);
- }
- }
-
- aOutline = outlineData;
- aLength = len;
- return KErrNone;
- }
EXPORT_C TUint32 CBitmapFont::UniqueFontId()
{
@@ -1340,866 +1157,6 @@
}
-CFontTableCacheItem::CFontTableCacheItem(TUid &aFileUid, const TUint32 aTag,
- TInt aOffset, TInt aLength): iFileUid(aFileUid), iTag(aTag),
- iOffset(aOffset), iLength(aLength)
- {
- // a null constructor
- }
-
-CFontTableCacheItem::~CFontTableCacheItem()
- {
- iUsers.ResetAndDestroy();
- iUsers.Close();
- }
-
-TBool CFontTableCacheItem::HasOutstandingRefCount()
- {
- TInt count = iUsers.Count();
- for (TInt j = 0; j < count; ++j)
- {
- if (iUsers[j]->iRefCount > 0)
- {
- return ETrue;
- }
- }
- return EFalse;
- }
-
-
-TInt CFontTableCacheItem::FindUser(TInt aSessionHandle, TInt *id)
- {
- TInt len = iUsers.Count();
- for (TInt i = 0; i < len; ++i)
- {
- if (aSessionHandle == iUsers[i]->iSessionHandle)
- {
- *id = i;
- return KErrNone;
- }
- }
- return KErrNotFound;
- }
-
-TInt CFontTableCacheItem::DecRefCount(TInt aSessionHandle)
- {
- TInt id = 0;
- TInt ret = FindUser(aSessionHandle, &id);
- if (KErrNone == ret)
- {
- iUsers[id]->iRefCount--;
- if (0 == iUsers[id]->iRefCount)
- {
- delete iUsers[id];
- iUsers.Remove(id);
- }
- return iUsers.Count();
- }
- return KErrNotFound;
- }
-
-TInt CFontTableCacheItem::IncRefCount(TInt aSessionHandle)
- {
- TInt id = 0;
- TInt ret = FindUser(aSessionHandle, &id);
- if (KErrNone == ret)
- {
- iUsers[id]->iRefCount++;
- }
- else
- {
- TCacheUserInfo *newUser = new TCacheUserInfo(aSessionHandle, 1);
- if (NULL != newUser)
- {
- TRAP(ret, iUsers.AppendL(newUser));
- }
- else
- {
- ret = KErrNoMemory;
- }
- //coverity[leaked_storage]
- // The 'newUser' is kept in iUsers. It will be deleted in DecRefCount().
- }
- return ret;
- }
-
-TInt CFontTableCache::Append(TUid aFileUid, TUint32 aTag,
- TAny *&aContent, TInt aLength)
- {
- TInt ret = 0;
- if ((TUint32)iCacheMemMon.GetMemUsage() >= KFontTable_GlyphOutline_CacheMaxMem)
- {
- RDebug::Printf("Table/Glyph cache full. Unable to add new item.");
- return KErrNoMemory;
- }
- // make a copy of the table content on the shared heap.
- TAny *sharedCopy = iHeap->Alloc(aLength);
- if (NULL == sharedCopy)
- {
- return KErrNoMemory;
- }
-
- Mem::Copy(sharedCopy, aContent, aLength);
-
- CFontTableCacheItem *newItem = NULL;
- TInt offset = PointerToOffset(sharedCopy, iHeap->Base());
- TRAP(ret, newItem = new(ELeave) CFontTableCacheItem(aFileUid, aTag, offset, aLength));
- if (KErrNone != ret)
- {
- iHeap->Free(sharedCopy);
- return ret;
- }
-
- TRAP(ret, iCacheItems.AppendL(newItem));
- if (KErrNone == ret)
- {
- // do not free 'aContent', because the mem is managed by
- // rasterizer cache.
- aContent = sharedCopy;
- iCacheMemMon.Inc(aLength);
- }
- else
- {
- iHeap->Free(sharedCopy);
- }
-#ifdef _DEBUG
- GetCacheState(__func__);
-#endif
- return ret;
- }
-
-TInt CFontTableCache::Find(TUid aFileUid, TUint32 aTag, TAny *&aContent,
- TInt &aLength, TInt *id)
- {
- *id = KErrNotFound;
- TInt len = iCacheItems.Count();
-
- TInt ret = KErrNotFound;
- for (TInt i = 0; i < len; ++i)
- {
- CFontTableCacheItem *item = iCacheItems[i];
- if (item->iFileUid == aFileUid && item->iTag == aTag)
- {
- aContent = OffsetToPointer(item->iOffset, iHeap->Base());
- aLength = item->iLength;
- *id = i;
- ret = KErrNone;
- break;
- }
- }
-
-#ifdef _DEBUG
- GetCacheState(__func__);
-#endif
- return ret;
- }
-
-CFontTableCache::CFontTableCache(RHeap *aHeap, TFontTableGlyphOutlineCacheMemMonitor &aMon):
- iCacheMemMon(aMon), iHeap(aHeap)
- {
- // null constructor
- }
-
-CFontTableCache::~CFontTableCache()
- {
- for (TInt i = 0; i < iCacheItems.Count(); ++i)
- {
- iHeap->Free(OffsetToPointer(iCacheItems[i]->iOffset, iHeap->Base()));
- }
- iCacheItems.ResetAndDestroy();
- iCacheItems.Close();
- }
-
-TInt CFontTableCache::IncRefCount(TUid aFileUid, TUint32 aTag, TInt aSessionHandle)
- {
- TAny *outline = NULL;
- TInt len = 0;
- TInt id = 0;
-
- TInt ret = Find(aFileUid, aTag, outline, len, &id);
- if (KErrNone == ret)
- {
- ret = iCacheItems[id]->IncRefCount(aSessionHandle);
- }
-
-#ifdef _DEBUG
- GetCacheState(__func__);
-#endif
- return ret;
- }
-
-TInt CFontTableCache::DecRefCount(TUid aFileUid, TUint32 aTag, TInt aSessionHandle)
- {
- TAny *outline = NULL;
- TInt len = 0;
- TInt id = 0;
-
- TInt ret = Find(aFileUid, aTag, outline, len, &id);
- if (KErrNone == ret)
- {
- TInt numUsers = iCacheItems[id]->DecRefCount(aSessionHandle);
- if (0 == numUsers)
- {
- // There is no outstanding reference to the cache item.
- iHeap->Free(outline);
- iCacheMemMon.Dec(len);
- delete (iCacheItems[id]);
- iCacheItems.Remove(id);
- }
- }
-
-#ifdef _DEBUG
- GetCacheState(__func__);
-#endif
- return ret;
- }
-
-TBool CFontTableCache::HasOutstandingRefCount()
- {
- TInt len = iCacheItems.Count();
-
- for (TInt i = 0; i < len; ++i)
- {
- if (iCacheItems[i]->HasOutstandingRefCount())
- {
- return ETrue;
- }
- }
- return EFalse;
- }
-
-TBool CFontTableCache::HasOutstandingRefCountWithUid(TUid aFileUid)
- {
- TInt len = iCacheItems.Count();
-
- for (TInt i = 0; i < len; ++i)
- {
- if (iCacheItems[i]->iFileUid == aFileUid)
- {
- if (iCacheItems[i]->HasOutstandingRefCount())
- {
- return ETrue;
- }
- }
- }
- return EFalse;
- }
-
-void CFontTableCache::CleanupCacheOnOpenFontFileRemoval(COpenFontFile *)
- {
- // In CFontStore::RemoveFile(), a font file is not allowed to be removed if
- // there are outstanding ref counts on any table in it. If that check passed
- // and this function is called, there shall be no cache item for that file.
-
- // Currently a cache item having a refcount of 0 is removed immediately.
- // If this strategy is changed in the future, we may need to do some
- // cleanup here.
- }
-
-void CFontTableCache::CleanupCacheOnFbsSessionTermination(TInt aSessionHandle)
- {
- TInt len = iCacheItems.Count();
-
- for (TInt i = 0; i < len; ++i)
- {
- TInt id = -1;
- if (KErrNone == iCacheItems[i]->FindUser(aSessionHandle, &id))
- {
- iCacheItems[i]->iUsers.Remove(id);
- if (iCacheItems[i]->iUsers.Count() == 0)
- {
- iHeap->Free(OffsetToPointer(iCacheItems[i]->iOffset, iHeap->Base()));
- iCacheMemMon.Dec(iCacheItems[i]->iLength);
- delete iCacheItems[i];
- iCacheItems.Remove(i);
- }
- }
- }
- }
-
-
-#ifdef _DEBUG
-TInt CFontTableCache::GetCacheState(const char *func)
- {
- RDebug::Printf("%s called from %s: ", __func__, func);
- TBuf<256> buf;
-
- int len = iCacheItems.Count();
- int numTables = 0, numSessions = 0, totalRef = 0;
- buf.Append(_L("Table cache: "));
- for (int i = 0; i < len; ++i)
- {
- ++numTables;
- TInt abc = iCacheItems[i]->iUsers.Count();
- numSessions += abc;
- for (int j = 0; j < abc; ++j)
- {
- totalRef += iCacheItems[i]->iUsers[j]->iRefCount;
- }
- }
- if (0 == iCacheItems.Count())
- {
- buf.Append(_L("cache empty. "));
- }
- else
- {
- buf.AppendFormat(_L("%d tables referenced by %d sessions, total ref count %d"),
- numTables, numSessions, totalRef);
- }
- RDebug::RawPrint(buf);
- return 0;
- }
-#endif
-
-
-
-TInt COutlineCacheItem::FindUser(TInt aSessionHandle, TInt *id)
- {
- TInt len = iUsers.Count();
- for (TInt i = 0; i < len; ++i)
- {
- if (aSessionHandle == iUsers[i]->iSessionHandle)
- {
- *id = i;
- return KErrNone;
- }
- }
- return KErrNotFound;
- }
-
-COutlineCacheItem::~COutlineCacheItem()
- {
- iUsers.ResetAndDestroy();
- }
-
-COutlineCacheItem::COutlineCacheItem(TInt aOffset, TInt aLength):
- iOffset(aOffset), iLength(aLength)
- {
- // a null constructor.
- }
-
-TInt COutlineCacheItem::DecRefCount(TInt aSessionHandle)
- {
- TInt id = 0;
- TInt ret = FindUser(aSessionHandle, &id);
- if (KErrNone == ret)
- {
- iUsers[id]->iRefCount--;
- if (0 == iUsers[id]->iRefCount)
- {
- delete iUsers[id];
- iUsers.Remove(id);
- }
- return iUsers.Count();
- }
- return KErrNotFound;
- }
-
-TInt COutlineCacheItem::IncRefCount(TInt aSessionHandle)
- {
- TInt id = 0;
- TInt ret = FindUser(aSessionHandle, &id);
- if (KErrNone == ret)
- {
- iUsers[id]->iRefCount++;
- }
- else
- {
- TCacheUserInfo *newUser = new TCacheUserInfo(aSessionHandle, 1);
- if (NULL != newUser)
- {
- TRAP(ret, iUsers.AppendL(newUser));
- }
- else
- {
- ret = KErrNoMemory;
- }
- //coverity[leaked_storage]
- // The 'newUser' is kept in iUsers. It will be deleted in DecRefCount().
- }
- return ret;
- }
-
-#ifdef _DEBUG
-TInt CUnhintedOutlineCache::GetCacheState(const char *func)
- {
- RDebug::Printf("%s called from %s: ", __func__, func);
- int numSessions = 0, totalRef = 0;
- THashMapIter<TUnhintedOutlineId, COutlineCacheItem*> it(iItemIdMap);
- it.NextValue();
- while (it.CurrentValue())
- {
- COutlineCacheItem **data = it.CurrentValue();
- int len = (*data)->iUsers.Count();
- numSessions += len;
- for (int j = 0; j < len; ++j)
- {
- totalRef += (*data)->iUsers[j]->iRefCount;
- }
- it.NextValue();
- }
-
- TBuf<256> buf;
- buf.Append(_L("Unhinted outline cache: "));
- TInt numItems = iItemIdMap.Count();
- if (0 == numItems)
- {
- buf.Append(_L("empty. "));
- }
- else
- {
- buf.AppendFormat(_L("%d glyphs, %d sessions, total refcount %d"),
- numItems, numSessions, totalRef);
- }
-
- RDebug::RawPrint(buf);
-
- return 0;
- }
-#endif
-
-CUnhintedOutlineCache::CUnhintedOutlineCache(RHeap *aHeap, TFontTableGlyphOutlineCacheMemMonitor &aMon):
- iCacheMemMon(aMon), iHeap(aHeap),
- iItemIdMap(THashFunction32<TUnhintedOutlineId>(CUnhintedOutlineCache::IdHash),
- TIdentityRelation<TUnhintedOutlineId>(CUnhintedOutlineCache::IdIdentity))
- {
-
- }
-
-CUnhintedOutlineCache::~CUnhintedOutlineCache()
- {
- THashMapIter<TUnhintedOutlineId, COutlineCacheItem*> it(iItemIdMap);
- it.NextValue();
- while (it.CurrentValue())
- {
- const TUnhintedOutlineId *outlineId = it.CurrentKey();
- COutlineCacheItem **data = it.CurrentValue();
-
- // loop body here!
- iHeap->Free(OffsetToPointer((*data)->iOffset, iHeap->Base()));
- delete (*data);
- iItemIdMap.Remove(*outlineId);
- // end loop body
-
- it.NextValue();
- }
- return;
- }
-
-
-TInt CUnhintedOutlineCache::CleanupCacheOnOpenFontFileRemoval(COpenFontFile *aFontFile)
- {
- TUid fileUid = aFontFile->Uid();
-
- THashMapIter<TUnhintedOutlineId, COutlineCacheItem*> it(iItemIdMap);
- it.NextValue();
- while (it.CurrentValue())
- {
- const TUnhintedOutlineId *outlineId = it.CurrentKey();
- COutlineCacheItem **data = it.CurrentValue();
-
- // loop body here!
- if (outlineId->iFileUid == fileUid)
- {
- iHeap->Free(OffsetToPointer((*data)->iOffset, iHeap->Base()));
- iCacheMemMon.Dec((*data)->iLength);
- delete (*data);
- iItemIdMap.Remove(*outlineId);
- }
- // end loop body
-
- it.NextValue();
- }
- return KErrNone;
- }
-
-TInt CUnhintedOutlineCache::CleanupCacheOnFbsSessionTermination(TInt aSessionHandle)
- {
- THashMapIter<TUnhintedOutlineId, COutlineCacheItem*> it(iItemIdMap);
- it.NextValue();
- while (it.CurrentValue())
- {
- const TUnhintedOutlineId *outlineId = it.CurrentKey();
- COutlineCacheItem **data = it.CurrentValue();
-
- // loop body here!
- TInt id = 0;
- TInt ret = (*data)->FindUser(aSessionHandle, &id);
- if (KErrNone == ret)
- {
- delete (*data)->iUsers[id];
- (*data)->iUsers.Remove(id);
- if (0 == (*data)->iUsers.Count())
- {
- iHeap->Free(OffsetToPointer((*data)->iOffset, iHeap->Base()));
- iCacheMemMon.Dec((*data)->iLength);
- delete (*data);
- iItemIdMap.Remove(*outlineId);
- }
- }
- // end loop body
-
- it.NextValue();
- }
- return KErrNone;
- }
-
-
-TInt CUnhintedOutlineCache::CacheUnhintedOutline(const TUnhintedOutlineId &aOutlineId,
- TAny* const aData, const TInt aLength, TAny *&aOutline, TInt &aLen)
- {
-#ifdef _DEBUG
- GetCacheState(__func__);
-#endif
- if ((TUint32)iCacheMemMon.GetMemUsage() >= KFontTable_GlyphOutline_CacheMaxMem)
- {
- RDebug::Printf("Table/Glyph cache full. Unable to add new item.");
- return KErrNoMemory;
- }
-
- aLen = KErrGeneral;
- TInt ret1= KErrNone;
-
- // make a copy of the outline data on the shared heap.
- TAny *sharedCopy = iHeap->Alloc(aLength);
- if (NULL == sharedCopy)
- {
- return KErrNoMemory;
- }
-
- Mem::Copy(sharedCopy, aData, aLength);
-
- COutlineCacheItem *newItem = NULL;
- TInt offset = PointerToOffset(sharedCopy, iHeap->Base());
- TRAP(ret1, newItem = new(ELeave) COutlineCacheItem(offset, aLength));
- if (KErrNone != ret1)
- {
- iHeap->Free(sharedCopy);
- sharedCopy = NULL;
- }
- else
- {
- TRAP(ret1, iItemIdMap.InsertL(aOutlineId, newItem));
- if (KErrNone != ret1)
- {
- delete newItem;
- iHeap->Free(sharedCopy);
- sharedCopy = NULL;
- }
- else
- {
- iCacheMemMon.Inc(aLength);
- aLen = aLength;
- }
- }
- aOutline = sharedCopy;
- return ret1;
- }
-
-TInt CUnhintedOutlineCache::IncRefCount(const TUnhintedOutlineId &aOutlineId,
- TInt aSessionHandle)
- {
-#ifdef _DEBUG
- GetCacheState(__func__);
-#endif
- COutlineCacheItem **ret = iItemIdMap.Find(aOutlineId);
- if (NULL != ret)
- {
- (*ret)->IncRefCount(aSessionHandle);
- }
- return (NULL==ret?KErrNotFound:KErrNone);
- }
-
-TInt CUnhintedOutlineCache::DecRefCount(const TUnhintedOutlineId &aOutlineId,
- TInt aSessionHandle)
- {
-#ifdef _DEBUG
- GetCacheState(__func__);
-#endif
- COutlineCacheItem **ret = iItemIdMap.Find(aOutlineId);
- if (NULL != ret)
- {
- TInt numUsers = (*ret)->DecRefCount(aSessionHandle);
- if (0 == numUsers)
- {
- // There is no outstanding reference to the cache item.
- iHeap->Free(OffsetToPointer((*ret)->iOffset, iHeap->Base()));
- iCacheMemMon.Dec((*ret)->iLength);
- delete (*ret);
- iItemIdMap.Remove(aOutlineId);
- }
- }
- return (NULL==ret?KErrNotFound:KErrNone);
- }
-
-TInt CUnhintedOutlineCache::Find(const TUnhintedOutlineId &aOutlineId, TAny *&aData,
- TInt &aLength)
- {
- COutlineCacheItem **ret = iItemIdMap.Find(aOutlineId);
- TInt ret2 = KErrNone;
- if (NULL != ret)
- {
- aData = OffsetToPointer((*ret)->iOffset, iHeap->Base());
- aLength = (*ret)->iLength;
- }
- else
- {
- ret2 = KErrNotFound;
- }
- return ret2;
- }
-
-
-TUint32 CUnhintedOutlineCache::IdHash(const TUnhintedOutlineId &outlineId)
- {
- // The hash value:
- // bits 0-15: glyph id;
- // bits 16-23: lower 8 bit of font file uid
- // bits 24-27: lower 4 bit of the face index
- // bit 28: 'isGlyphId'
- TUint32 ret = 0;
- ret |= (outlineId.iId & KOutlineGlyphIdHashMask);
- ret |= (KOutlineFileUidHashMask & (outlineId.iFileUid.iUid << 16));
- ret |= (KOutlineFaceIndexHashMask & (outlineId.iFaceIndex << 24));
- ret = (ret % 701);
- return ret;
- }
-
-TBool CUnhintedOutlineCache::IdIdentity(const TUnhintedOutlineId &id1, const TUnhintedOutlineId &id2)
- {
- return id1.iId == id2.iId && id1.iFaceIndex == id2.iFaceIndex &&
- id1.iFileUid == id2.iFileUid;
- }
-
-// hinted outline cache
-#ifdef _DEBUG
-TInt CHintedOutlineCache::GetCacheState(const char *func)
- {
- RDebug::Printf("%s called from %s: ", __func__, func);
- int numSessions = 0, totalRef = 0;
- THashMapIter<THintedOutlineId, COutlineCacheItem*> it(iItemIdMap);
- it.NextValue();
- while (it.CurrentValue())
- {
- COutlineCacheItem **data = it.CurrentValue();
- int len = (*data)->iUsers.Count();
- numSessions += len;
- for (int j = 0; j < len; ++j)
- {
- totalRef += (*data)->iUsers[j]->iRefCount;
- }
- it.NextValue();
- }
-
- TBuf<256> buf;
- buf.Append(_L("Hinted outline cache: "));
- TInt numItems = iItemIdMap.Count();
- if (0 == numItems)
- {
- buf.Append(_L("empty. "));
- }
- else
- {
- buf.AppendFormat(_L("%d glyphs, %d sessions, total refcount %d"),
- numItems, numSessions, totalRef);
- }
-
- RDebug::RawPrint(buf);
-
- return 0;
- }
-#endif
-
-TInt CHintedOutlineCache::CleanupCacheOnOpenFontRemoval(COpenFont *aFont)
- {
- THashMapIter<THintedOutlineId, COutlineCacheItem*> it(iItemIdMap);
- it.NextValue();
- while (it.CurrentValue())
- {
- const THintedOutlineId *outlineId = it.CurrentKey();
- COutlineCacheItem **data = it.CurrentValue();
-
- // loop body here!
- if (outlineId->iFont == aFont)
- {
- iCacheMemMon.Dec((*data)->iLength);
- iHeap->Free(OffsetToPointer((*data)->iOffset, iHeap->Base()));
- delete (*data);
- iItemIdMap.Remove(*outlineId);
- }
- // end loop body
-
- it.NextValue();
- }
- return KErrNone;
- }
-
-TInt CHintedOutlineCache::CleanupCacheOnFbsSessionTermination(TInt aSessionHandle)
- {
- THashMapIter<THintedOutlineId, COutlineCacheItem*> it(iItemIdMap);
- it.NextValue();
- while (it.CurrentValue())
- {
- const THintedOutlineId *outlineId = it.CurrentKey();
- COutlineCacheItem **data = it.CurrentValue();
-
- // loop body here!
- TInt id = 0;
- TInt ret = (*data)->FindUser(aSessionHandle, &id);
- if (KErrNone == ret)
- {
- delete (*data)->iUsers[id];
- (*data)->iUsers.Remove(id);
- if (0 == (*data)->iUsers.Count())
- {
- iCacheMemMon.Dec((*data)->iLength);
- iHeap->Free(OffsetToPointer((*data)->iOffset, iHeap->Base()));
- delete (*data);
- iItemIdMap.Remove(*outlineId);
- }
- }
- // end loop body
-
- it.NextValue();
- }
-
- return KErrNone;
- }
-
-
-CHintedOutlineCache::CHintedOutlineCache(RHeap *aHeap, TFontTableGlyphOutlineCacheMemMonitor &aMon):
- iCacheMemMon(aMon), iHeap(aHeap),
- iItemIdMap(THashFunction32<THintedOutlineId>(CHintedOutlineCache::IdHash),
- TIdentityRelation<THintedOutlineId>(CHintedOutlineCache::IdIdentity))
- {
- // a null constructor
- }
-
-TInt CHintedOutlineCache::CacheHintedOutline(const THintedOutlineId &aOutlineId,
- TAny* aData, TInt aLength, TAny *&aOutline, TInt &aLen)
- {
-#ifdef _DEBUG
- GetCacheState(__func__);
-#endif
- if ((TUint32)iCacheMemMon.GetMemUsage() >= KFontTable_GlyphOutline_CacheMaxMem)
- {
- RDebug::Printf("Table/Glyph cache full. Unable to add new item.");
- return KErrNoMemory;
- }
-
- aLen = KErrGeneral;
- TInt ret = KErrNone;
- // make a copy of the outline data on the shared heap.
- TAny *sharedCopy = iHeap->Alloc(aLength);
- if (NULL == sharedCopy)
- {
- return KErrNoMemory;
- }
-
- Mem::Copy(sharedCopy, aData, aLength);
-
- COutlineCacheItem *newItem = NULL;
- TInt offset = PointerToOffset(sharedCopy, iHeap->Base());
- TRAP(ret, newItem = new(ELeave) COutlineCacheItem(offset, aLength));
- if (KErrNone != ret)
- {
- iHeap->Free(sharedCopy);
- sharedCopy = NULL;
- }
- else
- {
- TRAP(ret, iItemIdMap.InsertL(aOutlineId, newItem));
- if (KErrNone != ret)
- {
- delete newItem;
- iHeap->Free(sharedCopy);
- sharedCopy = NULL;
- }
- else
- {
- iCacheMemMon.Inc(aLength);
- aLen = aLength;
- }
- }
- aOutline = sharedCopy;
- return ret;
- }
-
-TInt CHintedOutlineCache::IncRefCount(const THintedOutlineId &aOutlineId,
- TInt aSessionHandle)
- {
-#ifdef _DEBUG
- GetCacheState(__func__);
-#endif
- COutlineCacheItem **data = iItemIdMap.Find(aOutlineId);
- if (NULL != data)
- {
- (*data)->IncRefCount(aSessionHandle);
- }
- return (NULL==data?KErrNotFound:KErrNone);
- }
-
-TInt CHintedOutlineCache::DecRefCount(const THintedOutlineId &aOutlineId,
- TInt aSessionHandle)
- {
-#ifdef _DEBUG
- GetCacheState(__func__);
-#endif
- COutlineCacheItem **data = iItemIdMap.Find(aOutlineId);
- if (NULL != data)
- {
- TInt numUsers = (*data)->DecRefCount(aSessionHandle);
- if (0 == numUsers)
- {
- // There is no outstanding reference to the cache item.
- iCacheMemMon.Dec((*data)->iLength);
- iHeap->Free(OffsetToPointer((*data)->iOffset, iHeap->Base()));
- delete (*data);
- iItemIdMap.Remove(aOutlineId);
- }
- }
- return (NULL==data?KErrNotFound:KErrNone);
- }
-
-TInt CHintedOutlineCache::Find(const THintedOutlineId &aOutlineId,
- TAny *&aData, TInt &aLength)
- {
- COutlineCacheItem **ret = iItemIdMap.Find(aOutlineId);
- TInt ret2 = KErrNone;
- if (NULL != ret)
- {
- aData = OffsetToPointer((*ret)->iOffset, iHeap->Base());
- aLength = (*ret)->iLength;
- }
- else
- {
- ret2 = KErrNotFound;
- }
- return ret2;
- }
-
-
-TUint32 CHintedOutlineCache::IdHash(const THintedOutlineId &outlineId)
- {
- // The hash value:
- // bits 0-15: the outline id
- // bits 16-27: the lower 12 bits of the font pointer
- // bit 28: 'isGlyphId'
-
- TUint32 ret = 0;
- ret |= (KOutlineGlyphIdHashMask & outlineId.iId);
- ret |= (KOutlineFontPtrHashMask & (((TUint32)outlineId.iFont) << 16));
- ret = ret % 701;
- return ret;
- }
-
-TBool CHintedOutlineCache::IdIdentity(const THintedOutlineId &id1, const THintedOutlineId &id2)
- {
- return id1.iId == id2.iId && id1.iFont == id2.iFont;
- }
-// hinted cache
-
-
CFontStore::CFontStore(RHeap* aHeap):
iKPixelWidthInTwips(KDefaultPixelWidthInTwips),
iKPixelHeightInTwips(KDefaultPixelHeightInTwips),
@@ -2261,12 +1218,6 @@
if (twipSize.iHeight > 0 && pixelSize.iHeight > 0)
iKPixelHeightInTwips = twipSize.iHeight * 1000 / pixelSize.iHeight;
-
- iCacheMemMon = new(ELeave) TFontTableGlyphOutlineCacheMemMonitor;
- iUnhintedOutlineCache = new(ELeave) CUnhintedOutlineCache(iHeap, *iCacheMemMon);
- iHintedOutlineCache = new(ELeave) CHintedOutlineCache(iHeap, *iCacheMemMon);
- iFontTableCache = new(ELeave) CFontTableCache(iHeap, *iCacheMemMon);
-
}
/** Creates a new CFontStore object.
@@ -2311,11 +1262,6 @@
delete iHandleArray;
}
iFs.Close();
-
- delete iFontTableCache;
- delete iUnhintedOutlineCache;
- delete iHintedOutlineCache;
- delete iCacheMemMon;
}
@@ -2795,11 +1741,6 @@
if((*iFontAccess)[i].iAccessCount)
return;
}
- if (iFontTableCache && iFontTableCache->HasOutstandingRefCount())
- {
- // disallow font file removal if any font tables are still cached
- return;
- }
iTypefaceList.ResetAndDestroy();
count = iFontBitmapList.Count();
@@ -2834,14 +1775,6 @@
}
}
} // Safe to proceed with removing file
- // also check if there are outstanding references to any
- // table in that file.
- if (iFontTableCache && iFontTableCache->HasOutstandingRefCountWithUid(aFileUid))
- {
- return; // outstanding reference to font table found.
- }
-
- // Safe to proceed with removing file
if (iOpenFontFileList[i]->DecRefCount())
{ // unload the font file
RemoveTypefacesFromSupportList(iOpenFontFileList[i]);
@@ -4901,147 +3834,6 @@
return EFalse;
}
-TInt CFontStore::CacheFontTable(TUid aFileUid, TUint32 aTag,
- TAny *&aContent, TInt aLength)
- {
- return iFontTableCache->Append(aFileUid, aTag, aContent, aLength);
- }
-
-TInt CFontStore::FindFontTableInCache(TUid aFileUid, TUint32 aTag,
- TAny *&aContent, TInt &aLength)
- {
- TInt id;
- return iFontTableCache->Find(aFileUid, aTag, aContent, aLength, &id);
- }
-
-TInt CFontStore::IncreaseUnhintedOutlineRefCount(const TUnhintedOutlineId &aOutlineId,
- TInt aSessionHandle)
- {
- return iUnhintedOutlineCache->IncRefCount(aOutlineId, aSessionHandle);
- }
-
-TInt CFontStore::IncreaseHintedOutlineRefCount(const THintedOutlineId &aOutlineId,
- TInt aSessionHandle)
- {
- return iHintedOutlineCache->IncRefCount(aOutlineId, aSessionHandle);
- }
-
-TInt CFontStore::IncFontTableRefCount(TUid aFileUid, TUint32 aTag,
- TInt aSessionHandle)
- {
- return iFontTableCache->IncRefCount(aFileUid, aTag, aSessionHandle);
- }
-
-TInt CFontStore::DecFontTableRefCount(TUid aFileUid, TUint32 aTag,
- TInt aSessionHandle)
- {
- return iFontTableCache->DecRefCount(aFileUid, aTag, aSessionHandle);
- }
-
-TInt CFontStore::CacheUnhintedOutline(const TUnhintedOutlineId &aOutlineId, TAny * aData,
- TInt aLength, TAny *&aOutline, TInt &aLen)
- {
- return iUnhintedOutlineCache->CacheUnhintedOutline(aOutlineId, aData, aLength,
- aOutline, aLen);
- }
-
-TInt CFontStore::CacheHintedOutline(const THintedOutlineId &aOutlineId,
- TAny * aData, TInt aLength, TAny *&aOutline, TInt &aLen)
- {
- return iHintedOutlineCache->CacheHintedOutline(aOutlineId, aData, aLength,
- aOutline, aLen);
- }
-
-TInt CFontStore::ReleaseUnhintedOutline(const TUnhintedOutlineId &aOutlineId,
- TInt aSessionHandle)
- {
- return iUnhintedOutlineCache->DecRefCount(aOutlineId, aSessionHandle);
- }
-
-TInt CFontStore::ReleaseHintedOutline(const THintedOutlineId &aOutlineId,
- TInt aSessionHandle)
- {
- return iHintedOutlineCache->DecRefCount(aOutlineId, aSessionHandle);
- }
-
-TInt CFontStore::ReleaseFontTable(TUid aFileUid, TUint32 aTag,
- TInt aSessionHandle)
- {
- return iFontTableCache->DecRefCount(aFileUid, aTag, aSessionHandle);
- }
-
-TInt CFontStore::FindUnhintedOutlineInCache(const TUnhintedOutlineId &aOutlineId, TAny *&aData,
- TInt &aLength)
- {
- return iUnhintedOutlineCache->Find(aOutlineId, aData, aLength);
- }
-
-TInt CFontStore::FindHintedOutlineInCache(const THintedOutlineId &aOutlineId,
- TAny *&aData, TInt &aLength)
- {
- return iHintedOutlineCache->Find(aOutlineId, aData, aLength);
- }
-
-void CFontStore::CleanupCacheOnOpenFontRemoval(COpenFont *aFont)
- {
- iHintedOutlineCache->CleanupCacheOnOpenFontRemoval(aFont);
- //iUnhintedOutlineCache.OnOpenFontRemoval(aFont);
- }
-
-void CFontStore::CleanupCacheOnOpenFontFileRemoval(COpenFontFile *aFontFile)
- {
- iUnhintedOutlineCache->CleanupCacheOnOpenFontFileRemoval(aFontFile);
- iFontTableCache->CleanupCacheOnOpenFontFileRemoval(aFontFile);
- }
-
-/** Clean up font table and glyph outline caches when an FBS session is terminated.
- * All the reference counts related to that session are cleared.
-@param aSession: Input. A pointer to the terminating session.
-@return always returns KErrNone.
-@internalTechnology
-*/
-EXPORT_C
-void CFontStore::CleanupCacheOnFbsSessionTermination(TInt aSessionHandle)
- {
- iHintedOutlineCache->CleanupCacheOnFbsSessionTermination(aSessionHandle);
- iUnhintedOutlineCache->CleanupCacheOnFbsSessionTermination(aSessionHandle);
- iFontTableCache->CleanupCacheOnFbsSessionTermination(aSessionHandle);
- }
-
-
-void TFontTableGlyphOutlineCacheMemMonitor::Inc(TInt aBytes)
- {
- iBytes += aBytes;
- }
-
-void TFontTableGlyphOutlineCacheMemMonitor::Dec(TInt aBytes)
- {
- iBytes -= aBytes;
- }
-
-TInt TFontTableGlyphOutlineCacheMemMonitor::GetMemUsage()
- {
- return iBytes;
- }
-
-TFontTableGlyphOutlineCacheMemMonitor::TFontTableGlyphOutlineCacheMemMonitor():
- iBytes(0)
- {
- // null constructor
- }
-
-TUnhintedOutlineId::TUnhintedOutlineId(TUid aFileUid, TInt aFaceIndex, TUint aId):
-iFileUid(aFileUid), iFaceIndex(aFaceIndex), iId(aId)
- {
- // a null constructor;
- }
-
-THintedOutlineId::THintedOutlineId(COpenFont *aFont, TUint aId):
-iFont(aFont), iId(aId)
- {
- // a null constructor;
- }
-
#ifdef _DEBUG
/**
Returns a timestamp for use by FinishTimingL().