1031202 - factor out gfxMixedFontFamily lookup/creation into a helper function

Status: RESOLVED FIXED

(Core :: Graphics: Text, defect)

Description

[Cameron McCormack (:heycam)]

Attachment: patch

There are a number of places in gfxUserFontSet where we look up mFontFamilies and perhaps create one if it doesn't exist.  We should have functions for this so we don't have to duplicate this code.

Comment 1

[John Daggett (:jtd)]

Comment on attachment 8447034 [details] [diff] [review]
patch

r+ with name change noted below.

gfx/thebes/gfxUserFontSet.cpp 
@@ -661,27 +652,17 @@ gfxUserFontSet::AddFontFace(const nsAString& aFamilyName,
> -gfxFontFamily*
> +gfxMixedFontFamily*
>  gfxUserFontSet::GetFamily(const nsAString& aFamilyName) const
>  {
>      nsAutoString key(aFamilyName);
>      ToLowerCase(key);
>  
>      return mFontFamilies.GetWeak(key);
>  }
>  
> +gfxMixedFontFamily*
> +gfxUserFontSet::MaybeCreateFamily(const nsAString& aFamilyName)
> +{
> +    nsAutoString key(aFamilyName);
> +    ToLowerCase(key);
> +
> +    gfxMixedFontFamily* family = mFontFamilies.GetWeak(key);
> +    if (!family) {
> +        family = new gfxMixedFontFamily(aFamilyName);
> +        mFontFamilies.Put(key, family);
> +    }
> +    return family;
> +}

Rather than using the "Maybe" in a method name, in this case let's:
  - switch GetFamily ==> LookupFamily
  - use GetFamily instead of MaybeCreateFamily (with comment noting its behavior)

Comment 2

[Cameron McCormack (:heycam)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/30954594c1dd

Comment 3

[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 4

[Cameron McCormack (:heycam)]

Relanded: https://hg.mozilla.org/integration/mozilla-inbound/rev/8214bea32abb

Comment 5

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/8214bea32abb