1031187 - set family name on font entries more eagerly

Status: RESOLVED FIXED

(Core :: Graphics: Text, defect)

Description

[Cameron McCormack (:heycam)]

In bug 1028497 we will need to be able to create gfxProxyFontEntry objects (and resolve them to real font entries) that haven't been added to a gfx{Mixed,}FontFamily.  Currently mFontFamily on the entry is set only once the entry is added to the font family.  For the font entry objects created outside the user font set to go in the user font cache, they need to have their mFamilyName set.  This patch sets it as soon as we create a gfxProxyFontEntry and also once we resolve the gfxProxyFontEntry to an actual font entry.  There are some situations where we don't have the font family name to store on the font entry -- such as in gfxMacFontFamily::FindStyleVariations -- so I've made gfx{Mixed,}FontFamily::AddFontEntry set the family name if it hasn't been set yet, and if it has been set already, assert that it's the same as the name on the family object.

Comment 1

[Cameron McCormack (:heycam)]

Attachment: Part 1: Set mFamilyName eagerly on proxy and non-proxy gfxFontEntrys.

Comment 2

[Cameron McCormack (:heycam)]

Attachment: Part 2: Use family name from proxy rather than gfxMixedFontFamily when logging.

Now that we have a valid mFamilyName on all gfxProxyFontEntry objects, let's use it rather than the name from the gfxMixedFontFamily object when logging.  In bug 1028497, gfxProxyFontEntry objects created without being added to the user font set won't have a gfxMixedFontFamily passed in to the logging functions, so this will make the family name come out in the logs.

Comment 3

[Cameron McCormack (:heycam)]

This depends on the part 1 refactoring in bug 754215.

Comment 4

[Cameron McCormack (:heycam)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/091a5ced91cd
https://hg.mozilla.org/integration/mozilla-inbound/rev/dc4ff3a5afd1

Comment 5

[Carsten Book [:Tomcat]]

sorry had to backout this changes in https://tbpl.mozilla.org/?tree=Mozilla-Inbound&rev=0294fdaef9be since one of this changes caused test failures like https://tbpl.mozilla.org/php/getParsedLog.php?id=43424728&tree=Mozilla-Inbound

Comment 6

[Cameron McCormack (:heycam)]

Relanded:

https://hg.mozilla.org/integration/mozilla-inbound/rev/9ec5db6a1684
https://hg.mozilla.org/integration/mozilla-inbound/rev/df4473d66d38

Comment 7

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/9ec5db6a1684
https://hg.mozilla.org/mozilla-central/rev/df4473d66d38

Comment 8

[Brian Smith (:briansmith, :bsmith, use NEEDINFO?)]

(In reply to Carsten Book [:Tomcat] from comment #7)
> https://hg.mozilla.org/mozilla-central/rev/9ec5db6a1684
> https://hg.mozilla.org/mozilla-central/rev/df4473d66d38

I verified that backing out these two changesets locally fixes bug 1037442 for me.