1533428 - Rearrange some code to prepare for cross-process shared font list

Status: RESOLVED FIXED

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

Description

[Jonathan Kew [:jfkthame]]

In preparation for the shared-font-list being implemented in bug 1514869, it's helpful to do some shuffling-around of existing code, avoiding some #includes that end up causing conflicts (especially with windows headers) when they get pulled in by generated bindings code, and moving some utility functions to places where they'll be more easily usable by new code.

Comment 1

[Jonathan Kew [:jfkthame]]

Attachment: Bug 1533428 - patch 1 - Use fully-qualified name for mozilla::ipc::FileDescriptor in AutoMemMap.h, rather than depending on a 'using' declaration. r=jwatt

Depends on D22904

Comment 2

[Jonathan Kew [:jfkthame]]

Attachment: Bug 1533428 - patch 2 - Move the Orientation enum from gfxFont to nsFontMetrics to enable some #include-elimination, in particular to avoid including gfxTextRun.h in nsFontMetrics.h. r=jwatt

Depends on D22908

Comment 3

[Jonathan Kew [:jfkthame]]

Attachment: Bug 1533428 - patch 3 - Avoid including gfxTextRun.h in the CanvasRenderingContext2d.h header. r=jwatt

Depends on D22913

Comment 4

[Jonathan Kew [:jfkthame]]

Attachment: Bug 1533428 - patch 4 - Include chromium-config.mozbuild in the moz.build for a bunch more directories, so that IPC-related headers are available. r=jwatt

Depends on D22918

Comment 5

[Jonathan Kew [:jfkthame]]

Attachment: Bug 1533428 - patch 5 - Move the helper functions that measure the 'distance' between values of font properties (weight, stretch, style) to gfxFontUtils.h. r=jwatt

This will allow upcoming shared font-list to use the same helpers as the existing code.

Depends on D22922

Comment 6

[Jonathan Kew [:jfkthame]]

Attachment: Bug 1533428 - patch 6 - Consistently use the gfxPlatformFontList::PrefFontList type instead of repeatedly spelling out the array declaration. r=jwatt

Depends on D22926

Comment 7

[Jonathan Kew [:jfkthame]]

Attachment: Bug 1533428 - patch 7 - Create a FontFamily type that wraps either a gfxFontFamily pointer or a mozilla::fontlist::Family pointer (to be used by the shared font list), and use this in various places where we need to pass families around. r=jwatt

Depends on D22930

Comment 8

[Jonathan Kew [:jfkthame]]

Attachment: Bug 1533428 - patch 8 - Move the ReadOtherFamilyNamesForFace helper to gfxFontUtils, for use by shared fontlist code as well as by old gfxFontFamily. r=jwatt

Depends on D22934

Comment 9

[BugBot [:suhaib / :marco/ :calixte]]

There are some r+ patches which didn't land and no activity in this bug for 2 weeks.
:jfkthame, could you have a look please?

Comment 10

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/2d6b3268f45c
patch 1 - Use fully-qualified name for mozilla::ipc::FileDescriptor in AutoMemMap.h, rather than depending on a 'using' declaration. r=jwatt
https://hg.mozilla.org/integration/autoland/rev/a4e2c4690d8d
patch 2 - Move the Orientation enum from gfxFont to nsFontMetrics to enable some #include-elimination, in particular to avoid including gfxTextRun.h in nsFontMetrics.h. r=jwatt
https://hg.mozilla.org/integration/autoland/rev/075921737c95
patch 3 - Avoid including gfxTextRun.h in the CanvasRenderingContext2d.h header. r=jwatt
https://hg.mozilla.org/integration/autoland/rev/cbf40b5419bd
patch 4 - Include chromium-config.mozbuild in the moz.build for a bunch more directories, so that IPC-related headers are available. r=jwatt
https://hg.mozilla.org/integration/autoland/rev/3de67e6f53f2
patch 5 - Move the helper functions that measure the 'distance' between values of font properties (weight, stretch, style) to gfxFontUtils.h. r=jwatt
https://hg.mozilla.org/integration/autoland/rev/cbf5d7dfe34a
patch 6 - Consistently use the gfxPlatformFontList::PrefFontList type instead of repeatedly spelling out the array declaration. r=jwatt
https://hg.mozilla.org/integration/autoland/rev/04c04203c03f
patch 7 - Create a FontFamily type that wraps either a gfxFontFamily pointer or a mozilla::fontlist::Family pointer (to be used by the shared font list), and use this in various places where we need to pass families around. r=jwatt
https://hg.mozilla.org/integration/autoland/rev/545b89e876f2
patch 8 - Move the ReadOtherFamilyNamesForFace helper to gfxFontUtils, for use by shared fontlist code as well as by old gfxFontFamily. r=jwatt

Comment 11

[Cosmin Sabou [:CosminS]]

https://hg.mozilla.org/mozilla-central/rev/2d6b3268f45c
https://hg.mozilla.org/mozilla-central/rev/a4e2c4690d8d
https://hg.mozilla.org/mozilla-central/rev/075921737c95
https://hg.mozilla.org/mozilla-central/rev/cbf40b5419bd
https://hg.mozilla.org/mozilla-central/rev/3de67e6f53f2
https://hg.mozilla.org/mozilla-central/rev/cbf5d7dfe34a
https://hg.mozilla.org/mozilla-central/rev/04c04203c03f
https://hg.mozilla.org/mozilla-central/rev/545b89e876f2