AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Combine nameFontStyleProc and FindByNameStyle.

Browse Source 
These two functions do the same thing, combine them.

Review URL: https://codereview.chromium.org/688133003
This commit is contained in:
bungeman 2014-10-30 11:49:27 -07:00 committed by Commit bot
parent 43d5debc84
commit 967937c282
1 changed files with 21 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/ports/SkFontHost_mac.cpp
View File

@ -450,16 +450,16 @@ static SkFontID CTFontRef_to_SkFontID(CTFontRef fontRef) {
class SkTypeface_Mac : public SkTypeface { class SkTypeface_Mac : public SkTypeface {
public: public:
SkTypeface_Mac(const SkFontStyle& fs, SkFontID fontID, bool isFixedPitch, SkTypeface_Mac(const SkFontStyle& fs, SkFontID fontID, bool isFixedPitch,
CTFontRef fontRef, const char name[], bool isLocalStream) CTFontRef fontRef, const char requestedName[], bool isLocalStream)
: SkTypeface(fs, fontID, isFixedPitch) : SkTypeface(fs, fontID, isFixedPitch)
, fName(name) , fRequestedName(requestedName)
, fFontRef(fontRef) // caller has already called CFRetain for us , fFontRef(fontRef) // caller has already called CFRetain for us
, fIsLocalStream(isLocalStream) , fIsLocalStream(isLocalStream)
{ {
SkASSERT(fontRef); SkASSERT(fontRef);
} }
SkString fName; SkString fRequestedName;
AutoCFRelease<CTFontRef> fFontRef; AutoCFRelease<CTFontRef> fFontRef;
protected: protected:
@ -586,16 +586,17 @@ SkTypeface* SkCreateTypefaceFromCTFont(CTFontRef fontRef) {
return face; return face;
} }
struct NameStyleRec { struct NameStyle {
const char* fName; const char* fName;
SkFontStyle fStyle; SkFontStyle fStyle;
}; };
static bool FindByNameStyle(SkTypeface* face, const SkFontStyle& style, void* ctx) { static bool find_by_NameStyle(SkTypeface* cachedFace, const SkFontStyle& cachedStyle, void* ctx) {
const SkTypeface_Mac* mface = reinterpret_cast<SkTypeface_Mac*>(face); const SkTypeface_Mac* cachedMacFace = static_cast<SkTypeface_Mac*>(cachedFace);
const NameStyleRec* rec = reinterpret_cast<const NameStyleRec*>(ctx); const NameStyle* requested = static_cast<const NameStyle*>(ctx);
return rec->fStyle == style && mface->fName.equals(rec->fName); return cachedStyle == requested->fStyle
&& cachedMacFace->fRequestedName.equals(requested->fName);
} }
static const char* map_css_names(const char* name) { static const char* map_css_names(const char* name) {
@ -2016,25 +2017,14 @@ static int compute_metric(const SkFontStyle& a, const SkFontStyle& b) {
sqr((a.isItalic() != b.isItalic()) * 900); sqr((a.isItalic() != b.isItalic()) * 900);
} }
struct NameFontStyleRec {
SkString fFamilyName;
SkFontStyle fFontStyle;
};
static bool nameFontStyleProc(SkTypeface* face, const SkFontStyle&, void* ctx) {
SkTypeface_Mac* macFace = (SkTypeface_Mac*)face;
const NameFontStyleRec* rec = (const NameFontStyleRec*)ctx;
return macFace->fontStyle() == rec->fFontStyle &&
macFace->fName == rec->fFamilyName;
}
static SkTypeface* createFromDesc(CFStringRef cfFamilyName, CTFontDescriptorRef desc) { static SkTypeface* createFromDesc(CFStringRef cfFamilyName, CTFontDescriptorRef desc) {
NameFontStyleRec rec; NameStyle cacheRequest;
CFStringToSkString(cfFamilyName, &rec.fFamilyName); SkString skFamilyName;
rec.fFontStyle = fontstyle_from_descriptor(desc, NULL); CFStringToSkString(cfFamilyName, &skFamilyName);
cacheRequest.fName = skFamilyName.c_str();
cacheRequest.fStyle = fontstyle_from_descriptor(desc, NULL);
SkTypeface* face = SkTypefaceCache::FindByProcAndRef(nameFontStyleProc, &rec); SkTypeface* face = SkTypefaceCache::FindByProcAndRef(find_by_NameStyle, &cacheRequest);
if (face) { if (face) {
return face; return face;
} }
@ -2051,16 +2041,13 @@ static SkTypeface* createFromDesc(CFStringRef cfFamilyName, CTFontDescriptorRef
return NULL; return NULL;
} }
SkString str;
CFStringToSkString(cfFamilyName, &str);
bool isFixedPitch; bool isFixedPitch;
AutoCFRelease<CTFontDescriptorRef> ctFontDesc(CTFontCopyFontDescriptor(ctFont)); AutoCFRelease<CTFontDescriptorRef> ctFontDesc(CTFontCopyFontDescriptor(ctFont));
(void)fontstyle_from_descriptor(ctFontDesc, &isFixedPitch); (void)fontstyle_from_descriptor(ctFontDesc, &isFixedPitch);
SkFontID fontID = CTFontRef_to_SkFontID(ctFont); SkFontID fontID = CTFontRef_to_SkFontID(ctFont);
face = SkNEW_ARGS(SkTypeface_Mac, (rec.fFontStyle, fontID, isFixedPitch, face = SkNEW_ARGS(SkTypeface_Mac, (cacheRequest.fStyle, fontID, isFixedPitch,
ctFont, str.c_str(), false)); ctFont, skFamilyName.c_str(), false));
SkTypefaceCache::Add(face, face->fontStyle()); SkTypefaceCache::Add(face, face->fontStyle());
return face; return face;
} }
@ -2241,8 +2228,8 @@ protected:
familyName = FONT_DEFAULT_NAME; familyName = FONT_DEFAULT_NAME;
} }
NameStyleRec rec = { familyName, style }; NameStyle cacheRequest = { familyName, style };
SkTypeface* face = SkTypefaceCache::FindByProcAndRef(FindByNameStyle, &rec); SkTypeface* face = SkTypefaceCache::FindByProcAndRef(find_by_NameStyle, &cacheRequest);
if (NULL == face) { if (NULL == face) {
face = NewFromName(familyName, style); face = NewFromName(familyName, style);