545317 - Fonts are added multiple times to font cache

Status: RESOLVED FIXED

(Core :: Graphics, defect)

Description

[John Daggett (:jtd)]

As part of the refactoring done in font code for future harfbuzz support, the GetOrMakeFont method of gfxFontEntry calls a virtual method CreateFontInstance to create an derived instance of gfxFont and adds it to the font cache.  The code in CreateFontInstance (GDI, Mac) also adds the font to the font cache.

Comment 1

[John Daggett (:jtd)]

Attachment: patch, v.0.1a, trim out redundant code and rename cache lookup method

The simple solution is to only add the font to the font cache in GetOrMakeFont.  The rename avoids confusion between the static method (e.g. gfxWindowsFont::GetOrMakeFont) and the related gfxFontEntry method.

Comment 2

[Jonathan Kew [:jfkthame]]

Comment on attachment 426159 [details] [diff] [review]
patch, v.0.1a, trim out redundant code and rename cache lookup method

Looks fine to me.

(AFAICS, the cache should have handled things ok, so the redundant code was not actually harmful except for wasting some cycles and making things more confusing - both of which are of course good to get fixed.)

Comment 3

[John Daggett (:jtd)]

Pushed to trunk
http://hg.mozilla.org/mozilla-central/rev/bc4fb7ae302e