1533395 - Refactor gfxTextRange to better match how it's actually used

Status: RESOLVED FIXED

(Core :: Layout: Text and Fonts, task, P3)

Description

[Jonathan Kew [:jfkthame]]

The gfxTextRange struct is not well-named or -placed in the tree. It's not a general-purpose text range; it's used only by gfxFontGroup to keep track of ranges and associated fonts during the font-matching process for text run construction.

The MatchType enum within gfxTextRange exists only so we can expose how font matching happened via the dom::InspectorFontFace interface.

So I intend to define the MatchType enum within InspectorFontFace (and alias it as FontMatchType within gfxTextRun/gfxFontGroup), and move the gfxTextRange struct inside gfxFontGroup as a local TextRange type, which better reflects its purpose.

(The real motivation for this, aside from that it feels better-organized, is to eliminate the need for #include "gfxFont.h" in InspectorFontFace.h, because that led to conflicts later on in the shared-font-list work.)

Comment 1

[Jonathan Kew [:jfkthame]]

Attachment: Bug 1533395 - Refactor gfxTextRange struct, moving the MatchType enum to gfxTypes.h as FontMatchType, and the struct inside gfxFontGroup as a local type. r=jwatt

This more closely reflects what the match-type flags and the range struct are actually used for,
and allows us to reduce #include usage of the massive gfxFont.h header.

Comment 2

[Jonathan Kew [:jfkthame]]

:jwatt, just FYI - this is basically what you previously reviewed as "patch 3" in bug 1514869, but I've shuffled things around into what I think is a much better arrangement, and split it out into a dependent bug as it's a standalone change.

Comment 3

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/5e7654dc258d
Refactor gfxTextRange struct, moving the MatchType enum to gfxTypes.h as FontMatchType, and the struct inside gfxFontGroup as a local type. r=jwatt

Comment 4

[Cosmin Sabou [:CosminS]]

https://hg.mozilla.org/mozilla-central/rev/5e7654dc258d