583608 - warning: ‘const char* GetMIMEType(nsIPluginInstance*)’ defined but not used in nsObjectFrame.cpp

Status: RESOLVED FIXED

(Core :: Layout, defect)

Comment 1

[Daniel Holbert [:dholbert]]

There are now 3 "defined but not used [on linux]" warnings for this file:
> layout/generic/nsObjectFrame.cpp:1975: warning: 'void DrawPlugin(mozilla::layers::ImageContainer*, void*)' defined but not used
> layout/generic/nsObjectFrame.cpp:1983: warning: 'void OnDestroyImage(void*)' defined but not used
> layout/generic/nsObjectFrame.cpp:2787: warning: 'const char* GetMIMEType(nsIPluginInstance*)' defined but not used

These functions are only called in #ifdef XP_MACOSX blocks, so the function definitions themselves should be #ifdef XP_MACOSX.

Comment 2

[Daniel Holbert [:dholbert]]

Attachment: fix

This should do it. Testing locally & on tryserver as a cross-platform sanity-check.

Comment 3

[Daniel Holbert [:dholbert]]

Attachment: fix v2

Ah, tryserver told me that the previous patch had neglected to notice an #ifdef XP_WIN spot where "::GetMIMEType" is called.

This version tweaks the GetMIMEType ifdef to build if we're on XP_MACOSX or XP_WIN. This passed on TryServer.

Comment 4

[Daniel Holbert [:dholbert]]

http://hg.mozilla.org/mozilla-central/rev/29ea216a4153