822846 - Use nsMimeTypes.h in imagelib instead of working with literal strings

Status: RESOLVED FIXED

(Core :: Graphics: ImageLib, defect)

Description

[Seth Fowler [:seth] [:s2h]]

Bug 547707 seems to have removed a lot of uses of literal strings for mime types in Gecko, but we still have some left over in imagelib, as Ms2ger points out in bug 815471 comment 18. Let's get rid of those.

Comment 1

[Seth Fowler [:seth] [:s2h]]

Attachment: Use nsMimeTypes.h instead of working with literal strings in imagelib.

Proposed patch. I was very aggressive here and converted over _every_ occurrence of a mime type in imagelib. This still needs testing on try before review.

Comment 2

[Seth Fowler [:seth] [:s2h]]

Try job here: https://tbpl.mozilla.org/?tree=Try&rev=a38092327c3c

Comment 3

[Seth Fowler [:seth] [:s2h]]

Attachment: Use nsMimeTypes.h instead of working with literal strings in imagelib.

Trivial fix: remove a now-unneeded extern declaration.

Comment 4

[Seth Fowler [:seth] [:s2h]]

Try is 100% green. Requesting review.

Comment 5

[Seth Fowler [:seth] [:s2h]]

Attachment: Use nsMimeTypes.h instead of working with literal strings in imagelib.

Rebase.

Comment 6

[Seth Fowler [:seth] [:s2h]]

Try job for rebased version here: https://tbpl.mozilla.org/?tree=Try&rev=0956f88e7341

Comment 7

[Seth Fowler [:seth] [:s2h]]

We have a 100% green try and an r+. Requesting checkin.

Comment 8

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/5244caae8c46

Comment 9

[Ryan VanderMeulen [:RyanVM]]

Backed out for Windows build bustage.
https://hg.mozilla.org/integration/mozilla-inbound/rev/660750a95f60

https://tbpl.mozilla.org/php/getParsedLog.php?id=18223213&tree=Mozilla-Inbound

nsImageModule.cpp

c:\tools\sdks\v7.0\include\winuser.h(8986) : warning C4005: 'IMAGE_ICON' : macro redefinition

        e:\builds\moz2_slave\m-in-w32\build\obj-firefox\dist\include\nsMimeTypes.h(100) : see previous definition of 'IMAGE_ICON'

e:\builds\moz2_slave\m-in-w32\build\obj-firefox\dist\include\jmorecfg.h(201) : warning C4005: 'FAR' : macro redefinition

        c:\tools\sdks\v7.0\include\windef.h(146) : see previous definition of 'FAR'

e:\builds\moz2_slave\m-in-w32\build\image\src\BMPFileHeaders.h(38) : warning C4005: 'LCS_sRGB' : macro redefinition

        c:\tools\sdks\v7.0\include\wingdi.h(613) : see previous definition of 'LCS_sRGB'

e:/builds/moz2_slave/m-in-w32/build/image/build/nsImageModule.cpp(81) : error C2440: 'initializing' : cannot convert from 'int' to 'const char *'

        Conversion from integral type to pointer type requires reinterpret_cast, C-style cast or function-style cast

Comment 10

[Seth Fowler [:seth] [:s2h]]

Attachment: Use nsMimeTypes.h instead of working with literal strings in imagelib.

Renamed IMAGE_ICON to IMAGE_ICON_MS to avoid a clash with a system header file on Windows. New try job here: https://tbpl.mozilla.org/?tree=Try&rev=1d81c5952783

Comment 11

[Seth Fowler [:seth] [:s2h]]

Attachment: Use nsMimeTypes.h instead of working with literal strings in imagelib.

Went ahead and did a rebase while I was at it. Try is having problems so I'll have a new try job up later.

Comment 12

[Seth Fowler [:seth] [:s2h]]

New try job here: https://tbpl.mozilla.org/?tree=Try&rev=f67921bbdc21

Comment 13

[Seth Fowler [:seth] [:s2h]]

Attachment: Use nsMimeTypes.h instead of working with literal strings in imagelib.

That didn't do it. Let's try this again...

Comment 14

[Seth Fowler [:seth] [:s2h]]

New try job here: https://tbpl.mozilla.org/?tree=Try&rev=231fc8523011

Comment 15

[Seth Fowler [:seth] [:s2h]]

Try seems to be OK. Let's give this another shot. Requesting checkin.

Comment 16

[Seth Fowler [:seth] [:s2h]]

Attachment: Use nsMimeTypes.h instead of working with literal strings in imagelib.

To make checkin easier I went ahead and rebased this patch; there was an unrelated change that prevented it from applying cleanly. Shouldn't require another try run (someone had just changed 'struct' to 'class').

Comment 17

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/1b5445f3ff22

Comment 18

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/1b5445f3ff22