1228501 - remove nsFont::decorations

Status: RESOLVED FIXED

(Core :: Layout, defect)

Description

[David Baron :dbaron:]

While looking through CalcDifference methods for bug 1026820, I was reminded that we should remove nsFont::decorations, which I believe has been unused since time immemorial, and causes us to have extra code in various places to avoid including it in comparisons.

Comment 1

[David Baron :dbaron:]

Attachment: patch 1 - Remove decorations parameter to nsFont constructors

The removed parameter is always 0.

Comment 2

[David Baron :dbaron:]

Attachment: patch 2 - Remove nsFont::decorations member variable

The member variable was always set to 0 or to NS_FONT_DECORATION_NONE,
which is 0.

Although this does leave a gap in the structure, I don't see any
opportunities for reordering members to actually shrink nsFont.

Comment 3

[David Baron :dbaron:]

Attachment: patch 3 - Remove nsFont::BaseEquals

BaseEquals and Equals were made the same by patch 2, so BaseEquals can
be removed.

(operator== is also defined as an inlined call to Equals.)

Comment 4

[David Baron :dbaron:]

Attachment: patch 4 - Remove nsStyleFont::CalcFontDifference, which now duplicates the list of tests in nsFont::Equals

Comment 5

[David Baron :dbaron:]

Attachment: patch 5 - Remove NS_FONT_DECORATION_* constants

Decorations in Gecko are associated with the CSS 'text-decoration'
property, so the constants should live in nsStyleConsts.h, as they
largely already do (since the names defined there are the vast majority
of the uses).

Comment 6

[David Baron :dbaron:]

https://treeherder.mozilla.org/#/jobs?repo=try&revision=70ed5feb6d47&group_state=expanded

Comment 7

[David Baron :dbaron:]

https://hg.mozilla.org/integration/mozilla-inbound/rev/e1fd92eeb5ba40ef5ecf50793b911397fd9816d0
Bug 1228501 patch 1 - Remove decorations parameter to nsFont constructors.  r=jdaggett

https://hg.mozilla.org/integration/mozilla-inbound/rev/3a3cd254f508e87d384d7598b67751489370812a
Bug 1228501 patch 2 - Remove nsFont::decorations member variable.  r=jdaggett

https://hg.mozilla.org/integration/mozilla-inbound/rev/6c478d7a9467d8336d431cb383402af93da39c0d
Bug 1228501 patch 3 - Remove nsFont::BaseEquals.  r=jdaggett

https://hg.mozilla.org/integration/mozilla-inbound/rev/ec79945130ff962575dba5d4579071b7a3b38346
Bug 1228501 patch 4 - Remove nsStyleFont::CalcFontDifference, which now duplicates the list of tests in nsFont::Equals.  r=jdaggett

https://hg.mozilla.org/integration/mozilla-inbound/rev/cce90c9b7d1d3066919856d63de581865676aabd
Bug 1228501 patch 5 - Remove NS_FONT_DECORATION_* constants.  r=jdaggett

Comment 8

[Carsten Book [:Tomcat]]

sorry had to back this out in https://hg.mozilla.org/integration/mozilla-inbound/rev/196f2f131c70 since something in this push caused https://treeherder.mozilla.org/logviewer.html#?job_id=17983411&repo=mozilla-inbound

Comment 9

[Pulsebot]

Backout:
https://hg.mozilla.org/integration/mozilla-inbound/rev/8780fa4a1555
https://hg.mozilla.org/integration/mozilla-inbound/rev/37260f474fe4
https://hg.mozilla.org/integration/mozilla-inbound/rev/00534f958b5a
https://hg.mozilla.org/integration/mozilla-inbound/rev/849931b41e22
https://hg.mozilla.org/integration/mozilla-inbound/rev/23a833513092

Comment 10

[David Baron :dbaron:]

https://hg.mozilla.org/integration/mozilla-inbound/rev/43b52e48aec387fedbce10dc6d9bd8e2620d47f7
Bug 1228501 patch 1 - Remove decorations parameter to nsFont constructors.  r=jdaggett

https://hg.mozilla.org/integration/mozilla-inbound/rev/2879aebe0ccaf474600b27aa698de0385b43def9
Bug 1228501 patch 2 - Remove nsFont::decorations member variable.  r=jdaggett

https://hg.mozilla.org/integration/mozilla-inbound/rev/16798ce74d1e41d4cf87efd2db1604529acef19e
Bug 1228501 patch 3 - Remove nsFont::BaseEquals.  r=jdaggett

https://hg.mozilla.org/integration/mozilla-inbound/rev/d197e2ef0123e53cf40dedc2b9c9a317d1082973
Bug 1228501 patch 4 - Remove nsStyleFont::CalcFontDifference, which now duplicates the list of tests in nsFont::Equals.  r=jdaggett

https://hg.mozilla.org/integration/mozilla-inbound/rev/c15544b94db594a4619d63329704a0252e4e22b0
Bug 1228501 patch 5 - Remove NS_FONT_DECORATION_* constants.  r=jdaggett

Comment 11

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/43b52e48aec3
https://hg.mozilla.org/mozilla-central/rev/2879aebe0cca
https://hg.mozilla.org/mozilla-central/rev/16798ce74d1e
https://hg.mozilla.org/mozilla-central/rev/d197e2ef0123
https://hg.mozilla.org/mozilla-central/rev/c15544b94db5