415686 - remove FONT_LEADING_APIS_V2 ifdefs

Status: RESOLVED FIXED

(Core Graveyard :: GFX, defect)

Description

[David Baron :dbaron: (⌚️UTC-4, no longer working on Mozilla)]

There are some ifdefs in gfx and layout for FONT_LEADING_APIS_V2:
http://mxr.mozilla.org/seamonkey/search?string=FONT_LEADING_APIS_V2
that can be removed, since that macro is always defined when MOZ_CAIRO_GFX is defined.

Comment 1

[Peter Weilbacher]

Attachment: remove it

OK, this removes the macro from gfx/public/nsIFontMetrics.h and layout/generic/nsHTMLReflowState.cpp. The two files in gfx/src/windows/ will be taken care of in bug 418104.

However, that really means that GetLeading and GetNormalLineHeight should also get removed from the codebase. But then I see that those are part of nsThebesFontMetrics. Will be a bit more work to find out why those are there (or still there?). Also, there is gfx/src/nsRegressionTestFontMetrics.{h,cpp} that I don't find referenced anywhere, so it can probably be removed at this point, too.

Comment 2

[Peter Weilbacher]

Attachment: remove it and stuff that was related

I recompiled gfx and layout with this and it worked, so I guess this is OK. When FONT_LEADING_APIS_V2 was #defined in bug 353185 I guess it was just forgotten that in Thebes those two methods were not necessary any more.

Any other stuff that depends on GetLeading and GetNormalLineHeight is in obsolete gfx/src/* subdirectories.

Comment 3

[David Baron :dbaron: (⌚️UTC-4, no longer working on Mozilla)]

Comment on attachment 303912 [details] [diff] [review]
remove it and stuff that was related

r+sr=dbaron on everything except removal of nsRegressionTestFontMetrics.  You should check with stuart about that -- and you should probably just double-check with him that this doesn't cause any current work merge conflicts as well.

Comment 4

[Mike Beltzner [:beltzner, not reading bugmail]]

Comment on attachment 303912 [details] [diff] [review]
remove it and stuff that was related

a=beltzner for 1.9

Comment 5

[Peter Weilbacher]

Patch checked in to trunk. (Note that these macros will still be there in gfx/src/windows/ after this check-in, but as bug 418104 is filed and has a patch I'm resolving this fixed already now.)