MCL/sf/os/textandloc: comparison fontservices/fontstore/inc/OPENFONT.H

equal deleted inserted replaced

-:1fb32624e06b
+:e96e8a131979
 	inline TInt FontMaxDescent() const;
 	inline TInt FontLineGap() const;
 	inline TInt FontMaxHeight() const;
 	void DeleteShaper() const;
 	TInt GetFontTable(TUint32 aTag, TAny*& aTableContent, TInt& aLength);
-	TInt GetGlyphOutline(TUint aCode, TBool aHinted,
+	TInt GetGlyphOutline(TUint aCode, TBool aHinted, TAny*& aOutline, TInt& aLength);
-	            TAny*& aOutline, TInt& aLength);
-#ifdef FNTSTORE_SUPPORT_FMM
+protected:
-private:
 	/** WARNING: Function for internal use ONLY. Compatibility is not guaranteed in future releases.
 	*/
 	TInt PointerToThisOffset(const TAny* aAny);
 	/** WARNING: Function for internal use ONLY. Compatibility is not guaranteed in future releases.
 	*/
 	TAny* ThisOffsetToPointer(const TInt aOffset);
-#endif // FNTSTORE_SUPPORT_FMM
 protected:
 	RHeap* iHeap;
 	TOpenFontMetrics iMetrics;
 private:
 		lines of text in the font */
 	TInt iFontLineGap;
 private:
 	const COpenFontGlyph* Glyph(TInt aSessionHandle,TInt aCode) const;
 protected:
-#ifdef FNTSTORE_SUPPORT_FMM
 	/** WARNING: Function for internal use ONLY. Compatibility is not guaranteed in future releases.
 	*/
 	const COpenFontGlyph* FontCacheGlyph(TInt aCode,TInt*& aNode);
+	const COpenFontGlyph* FontCacheGlyph(TInt aCode);
-	/** Used to calculate an offset that is applied to pointers to objects on the
+	void SetGlyphCache(COpenFontGlyphCache* aGlyphCache);
-	FBServ shared heap to convert them to valid pointers in the current process.
-	Add the value returned here to pointers to items on the shared heap to get a
-	valid pointer to the item in the current process.
-	WARNING: Function for internal use ONLY. Compatibility is not guaranteed in future releases.
-	@return Returns an offset between the "this" pointer that this object had on
-	construction and its current "this" pointer.
-	*/
-	inline TInt Offset() const;
-#else
-	/** WARNING: Function for internal use ONLY. Compatibility is not guaranteed in future releases.
-	*/
-	const COpenFontGlyph* FontCacheGlyph(TInt aCode,COpenFontGlyphTreeEntry**& aNode);
-#endif // FNTSTORE_SUPPORT_FMM
-	/** WARNING: Function for internal use ONLY. Compatibility is not guaranteed in future releases.
-	*/
-	const COpenFontGlyph* FontCacheGlyph(TInt aCode);
 private:
 	const COpenFontGlyph* SessionCacheGlyph(RHeap* aHeap,TInt aSessionHandle,TInt aCode,
 											COpenFontSessionCache*& aCache,TInt& aIndex,TBool aCreate) const;
 	void RasterizeHelperL(TInt aCode,TOpenFontGlyphData* aGlyphData,TOpenFontGlyphData*& aTempGlyphData);
-#ifdef FNTSTORE_SUPPORT_FMM
-	inline COpenFontSessionCacheList* SessionCacheList();
+	COpenFontSessionCacheList* SessionCacheList()const;
-#endif // FNTSTORE_SUPPORT_FMM
+void SetSessionCacheList(COpenFontSessionCacheList* aSessionCacheList);
+void SetFile(COpenFontFile* aFile);
 private:
-	COpenFontFile* iFile;									// the file used by this font; null if it has been deleted
-															// or cannot be used
+// Offset from the address of the file used by this font.
+// If the file has been deleted or cannot be used, the offest will be zero.
+TInt iFileOffset;
 	TInt iFaceIndex;										// index of the face in the font file
 protected:
-	/** WARNING: Member variable for internal use ONLY. Compatibility is not guaranteed in future releases. Please use the provided APIs only.
+/**
-	 */
+WARNING: Compatibility is not guaranteed in future releases. Please use the provided APIs only.
-	COpenFontGlyphCache* iGlyphCache;						// the per-font glyph cache; owned by the font
+Offset from the address of this font of the per-font glyph cache which is owned by the font
+@internalTechnology
+*/
+TInt iGlyphCacheOffset;
 private:
-	COpenFontSessionCacheList* iSessionCacheList;			// the list of per-session glyph caches; owned by CFontStore
+// Offset from the address of this font of the list of per-session glyph
-#ifdef FNTSTORE_SUPPORT_FMM
+// caches which are owned by CFontStore
-	/** The initial "this" pointer that this object has when created. When this
+TInt iSessionCacheListOffset;
-	object is used in a different process the offset between this starting
-	"this" pointer and the current "this" pointer can be used to calculate
-	the offset to other objects that also exist on the shared FBServ heap.
-	@see Offset() */
-	TInt iStartingThis;
-#else
 	TAny* iReserved; // unused; for future expansion
-#endif // FNTSTORE_SUPPORT_FMM
 	};
 /** Open Font System Extension Interface abstract base class.
 COpenFont derivers should also derive from this interface to enable complex
 These are the attributes of the font represented by this object.
 @return The typeface attributes. */
 inline const TOpenFontFaceAttrib* COpenFont::FaceAttrib() const
 	{
-#ifdef FNTSTORE_SUPPORT_FMM
+return iFileOffset == 0 ? NULL : &File()->FaceAttrib(iFaceIndex);
-	return iFile ? &File()->FaceAttrib(iFaceIndex) : NULL;
-#else
-	return iFile ? &iFile->FaceAttrib(iFaceIndex) : NULL;
-#endif // FNTSTORE_SUPPORT_FMM
 	}
 /** Gets a pointer to the COpenFontFile which created this object.
 This is the COpenFontFile which owns the file that contains the definition
 to access the rasterizer context (engine).
 @return The COpenFontFile which created this object. */
 inline COpenFontFile* COpenFont::File() const
 	{
-#ifdef FNTSTORE_SUPPORT_FMM
+return iFileOffset == 0 ? NULL : reinterpret_cast<COpenFontFile*>(const_cast<COpenFont*>(PtrAdd(this, iFileOffset)));
-	return iFile?reinterpret_cast<COpenFontFile*>(reinterpret_cast<TInt>(iFile)+Offset()):NULL;
-#else
-	return iFile;
-#endif // FNTSTORE_SUPPORT_FMM
 	}
 /** Gets the index of this typeface within the font file.
 @return The index of this typeface within the font file. */
 */
 inline TInt COpenFont::FontMaxHeight() const
 	{
 	return iFontMaxAscent + iFontMaxDescent;
 	}
-#ifdef FNTSTORE_SUPPORT_FMM
-inline COpenFontSessionCacheList* COpenFont::SessionCacheList()
-	{
-	return iSessionCacheList?reinterpret_cast<COpenFontSessionCacheList*>(reinterpret_cast<TInt>(iSessionCacheList)+Offset()):NULL;
-	}
-/** Used to calculate an offset that can be applied to pointers to objects on the
-FBServ shared heap to convert them to valid pointers in the current process.
-Add the value returned here to pointers to items on the shared heap to get a
-valid pointer to the item in the current process.
-@return Returns an offset between the "this" pointer that this object had on
-construction and its current "this" pointer.
-*/
-inline TInt COpenFont::Offset() const
-	{
-	return reinterpret_cast<TInt>(this)-iStartingThis;
-	}
-#endif // FNTSTORE_SUPPORT_FMM
 /** Default C++ constructor.
 This sets all attribute fields to zero. As for other T classes, there is no
 need to explicitly clean-up objects derived from this class. */

branch	RCL_3
changeset 1	e96e8a131979
parent 0	1fb32624e06b
child 2	6971d1c87c9a