Bug 220858 – Move FontCascadeCache onto FontCache

• Status: RESOLVED
• Resolution: FIXED
• Component: WebCore Misc.

[Chris Lord]

Currently, FontCascadeCache is a singleton and is managed by some static global functions. This isn't particularly clear as it doesn't follow the convention of being a class with a singleton() method (it's just a typedef of a HashMap). I think it makes sense to integrate it with FontCache - this works well for making FontCache thread-safe, as the FontCascadeCache is also a requirement of using fonts and both can be managed easily using the same lock.

[Chris Lord]

Created attachment 418136 [details]
Patch

[Radar WebKit Bug Importer]

<rdar://problem/73748595>

[Myles C. Maxfield]

Comment on attachment 418136 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=418136&action=review

> Source/WebCore/ChangeLog:9
> +        Make FontCascadeCache and associated functions a child of FontCache,
> +        accessible via FontCache::singleton.

Why?

[Chris Lord]

(In reply to Myles C. Maxfield from comment #3)
> Comment on attachment 418136 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=418136&action=review
> 
> > Source/WebCore/ChangeLog:9
> > +        Make FontCascadeCache and associated functions a child of FontCache,
> > +        accessible via FontCache::singleton.
> 
> Why?

In the world of a thread-safe FontCache, having FontCascadeCache live on it makes it much easier to handle locking with a shared lock. I guess it could just as well be its own class if we promoted it to a full singleton class instead of a HashMap typedef.

[Chris Lord]

Created attachment 421170 [details]
Patch

[EWS]

Committed r273237: <https://commits.webkit.org/r273237>

All reviewed patches have been landed. Closing bug and clearing flags on attachment 421170 [details].

[Darin Adler]

Comment on attachment 421170 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=421170&action=review

> Source/WebCore/platform/graphics/FontCache.h:188
> +struct FontCascadeCacheEntry {
> +    WTF_MAKE_FAST_ALLOCATED;
> +public:

Just moved code, but: Better style is WTF_MAKE_STRUCT_FAST_ALLOCATED instead.

> Source/WebCore/platform/graphics/FontCache.h:192
> +    FontCascadeCacheEntry(FontCascadeCacheKey&& key, Ref<FontCascadeFonts>&& fonts)
> +        : key(WTFMove(key))
> +        , fonts(WTFMove(fonts))
> +    { }

Just moved code, but: We should be able to remove this and make minimal changes to get everything compiling.

> Source/WebCore/platform/graphics/FontCache.h:198
> +typedef HashMap<unsigned, std::unique_ptr<FontCascadeCacheEntry>, AlreadyHashed> FontCascadeCache;

Just moved code, but: In new code we want "using" here, not "typedef".

[Cameron McCormack (:heycam)]

Comment on attachment 421170 [details]
Patch

(webkit-patch went awry.)