diff -r 6124ff6478cc -r 11e2bb0d14ba fontservices/fontstore/inc/openfontsprivate.h --- a/fontservices/fontstore/inc/openfontsprivate.h Mon Jul 12 15:26:00 2010 +0800 +++ b/fontservices/fontstore/inc/openfontsprivate.h Thu Aug 26 11:46:18 2010 +0800 @@ -135,8 +135,6 @@ private: inline COpenFontSessionCacheEntry(const COpenFont* aFont, TInt aCode, TInt aGlyphIndex, const TOpenFontCharMetrics& aMetrics); ~COpenFontSessionCacheEntry(); -public: - TInt iLastAccess; // serial number of the last access to the glyph private: TInt iFontOffset; // offset of the font that contains this glyph, (not owned by this class!) @@ -150,20 +148,21 @@ */ class COpenFontSessionCache { + friend class COpenFontSessionCacheList; public: static COpenFontSessionCache* NewL(RHeap* aHeap, TInt aSessionHandle, TInt aEntries); void Delete(RHeap* aHeap); TInt SessionHandle() { return iSessionHandle; } - const COpenFontGlyph* Glyph(const COpenFont* aFont, TInt aCode, TInt& aIndex); + const COpenFontGlyph* Glyph(const COpenFont* aFont, TInt aCode, TInt& aIndex) const; void Insert(RHeap* aHeap, COpenFontSessionCacheEntry* aEntry, TInt aIndex); private: COpenFontSessionCache(TInt aSessionHandle); ~COpenFontSessionCache(); -public: - TInt iSessionHandle; - TInt iLastAccess; +private: + TInt iSessionHandle; + TInt64 iRandomSeed; ROffsetArray iEntryArray; };