Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-01 13:57:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

b=356235, implement textrun cache (landing #2), r+sr=roc,sr=stuart

Browse Source
This commit is contained in:
vladimir%pobox.com 2006-10-14 05:37:40 +00:00
parent c13ee71991
commit 1a223fbafb
5 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gfx/thebes/public/Makefile.in
View File

@ -23,6 +23,7 @@ EXPORTS = gfxASurface.h \
gfxRect.h \
gfxRegion.h \
gfxTypes.h \
gfxTextRunCache.h \
$(NULL)
ifdef MOZ_ENABLE_GLITZ

21
gfx/thebes/public/gfxFont.h
View File

@ -111,6 +111,18 @@ struct THEBES_API gfxFontStyle {
void ComputeWeightAndOffset(PRInt8 *outBaseWeight,
PRInt8 *outOffset) const;
PRBool Equals(const gfxFontStyle& other) const {
return (size == other.size) &&
(style == other.style) &&
(systemFont == other.systemFont) &&
(variant == other.variant) &&
(familyNameQuirks == other.familyNameQuirks) &&
(weight == other.weight) &&
(decorations == other.decorations) &&
(langGroup.Equals(other.langGroup)) &&
(sizeAdjust == other.sizeAdjust);
}
};
@ -160,6 +172,8 @@ protected:
class THEBES_API gfxFontGroup {
THEBES_INLINE_DECL_REFCOUNTING(gfxFontGroup)
public:
gfxFontGroup(const nsAString& aFamilies, const gfxFontStyle *aStyle);
@ -174,6 +188,11 @@ public:
return mFonts.Length();
}
PRBool Equals(const gfxFontGroup& other) const {
return mFamilies.Equals(other.mFamilies) &&
mStyle.Equals(other.mStyle);
}
const gfxFontStyle *GetStyle() const { return &mStyle; }
/* unicode method */
@ -197,6 +216,8 @@ public:
/* this will call back fc with the a generic font based on the style's langgroup */
void FindGenericFontFromStyle(FontCreationCallback fc, void *closure);
const nsString& GetFamilies() { return mFamilies; }
protected:
nsString mFamilies;
gfxFontStyle mStyle;

4
gfx/thebes/public/gfxTextRunCache.h
View File

@ -90,6 +90,10 @@ protected:
mString = &mRealString;
}
const GenericString& GetString() {
return mRealString;
}
nsRefPtr<gfxFontGroup> mFontGroup;
RealString mRealString;
const GenericString* mString;

1
gfx/thebes/src/Makefile.in
View File

@ -27,6 +27,7 @@ CPPSRCS = \
gfxImageSurface.cpp \
gfxFont.cpp \
gfxPlatform.cpp \
gfxTextRunCache.cpp \
$(NULL)
ifdef MOZ_TREE_CAIRO

8
gfx/thebes/src/gfxTextRunCache.cpp
View File

@ -80,9 +80,9 @@ gfxTextRunCache::GetOrMakeTextRun (gfxFontGroup *aFontGroup, const nsAString& aS
entry->Used();
tr = entry->textRun.get();
} else {
tr = aFontGroup->MakeTextRun(aString);
entry = new TextRunEntry(tr);
key.Realize();
tr = aFontGroup->MakeTextRun(key.GetString());
entry = new TextRunEntry(tr);
mHashTableUTF16.Put(key, entry);
}
@ -106,9 +106,9 @@ gfxTextRunCache::GetOrMakeTextRun (gfxFontGroup *aFontGroup, const nsACString& a
entry->Used();
tr = entry->textRun.get();
} else {
tr = aFontGroup->MakeTextRun(aString);
entry = new TextRunEntry(tr);
key.Realize();
tr = aFontGroup->MakeTextRun(key.GetString());
entry = new TextRunEntry(tr);
mHashTableASCII.Put(key, entry);
}