94373 - Name conflict: PrefChangedCallback exists in both layout, and mac gfx, will break Mac static build

Status: VERIFIED FIXED

(Core :: Layout, defect)

Description

[Simon Fraser [no longer active]]

A routine called 'PrefChangedCallback' is used in several places to implement 
preference callbacks:

http://lxr.mozilla.org/seamonkey/search?string=PrefChangedCallback.

In the Mac static build, we pick up those in

/gfx/src/mac/nsUnicodeMappingUtil.cpp

and

/layout/base/src/nsPresContext.cpp

with the result that the static build will behave incorrectly (since the linker 
will strip out one of those implementatoins).

I suggest that both are renamed to be unique.

Comment 1

[Simon Fraser [no longer active]]

Attachment: Gfx fix: Make callback a static method

Comment 2

[Simon Fraser [no longer active]]

Attachment: Make pref changed callback static in nsPresContext

Comment 3

[Simon Fraser [no longer active]]

cc: harishd for P3P use of PrefChangedCallbac, and neeti for PICS usage.

Comment 4

[Simon Fraser [no longer active]]

Could I get some review loving here?

Comment 5

[Marc Attinasi]

[s]r=attinasi for patches to make the callback methods static data members.

Comment 6

[Simon Fraser [no longer active]]

I'll take this. ftang: r= on attachment 45129 [details] [diff] [review] please.

Comment 7

[Blake Ross]

r/sr=blake

Comment 8

[Simon Fraser [no longer active]]

Fix checked in.

Comment 9

[Chris Petersen]

Since I 'm not exactly sure how to test this, I'm marking verified based on the
last comments.