926081 - Move stuff from xpcpublic.h to xpcprivate.h

Status: RESOLVED FIXED

(Core :: XPConnect, defect)

Description

[Andrew McCreight [:mccr8]]

There are a few things that look like they can be moved from xpcpublic.h to xpcprivate.h.  A lot of this depends on nsDOMClassInfo.cpp including xpcprivate.  Some of this may not be right, as XPCShell includes xpcpublic but not xpcprivate.

nsIGlobalObject: can remove include, if not, remove forward declaration
forward decl nsIXPConnectWrappedJS is unused in xpcpublic
IsReflector

XPCONNECT_GLOBAL_FLAGS_WITH_EXTRA_SLOTS
XPCONNECT_GLOBAL_EXTRA_SLOT_OFFSET
XPCONNECT_GLOBAL_FLAGS
TraceXPCGlobal
xpc_LocalizeRuntime
xpc_DelocalizeRuntime
IS_WN_CLASS
IS_WN_REFLECTOR
xpc_ActivateDebugMode
nsIMemoryReporterCallback fwd decl is in a weird place, move up or down
GetObjectPrincipal?
DOM_DefineQuickStubs
GetNativeForGlobal
GetJunkScope (GetJunkScopeGlobal is needed)
SystemErrorReporter
DefineStaticJSVals

Comment 1

[Bobby Holley (:bholley)]

(In reply to Andrew McCreight [:mccr8] from comment #0)
> There are a few things that look like they can be moved from xpcpublic.h to
> xpcprivate.h.  A lot of this depends on nsDOMClassInfo.cpp including
> xpcprivate.  Some of this may not be right, as XPCShell includes xpcpublic
> but not xpcprivate.

> IsReflector 
> XPCONNECT_GLOBAL_FLAGS_WITH_EXTRA_SLOTS
> XPCONNECT_GLOBAL_EXTRA_SLOT_OFFSET
> XPCONNECT_GLOBAL_FLAGS
> SystemErrorReporter
> DOM_DefineQuickStubs
> DefineStaticJSVals

These should stay in xpcpublic.

> GetNativeForGlobal
> GetJunkScope (GetJunkScopeGlobal is needed)

These should stay together.

> TraceXPCGlobal
> xpc_LocalizeRuntime
> xpc_DelocalizeRuntime
> xpc_ActivateDebugMode
> nsIMemoryReporterCallback fwd decl is in a weird place, move up or down
> IS_WN_CLASS
> IS_WN_REFLECTOR

I don't care what happens with these.

> GetObjectPrincipal?

This does the same thing as nsContentUtils::GetObjectPrincipal, so it can go to xpcprivate.

Comment 2

[Bobby Holley (:bholley)]

> DOM_DefineQuickStubs
> DefineStaticJSVals

Er, sorry. Those should have been in the "Don't care" list.

Comment 3

[Andrew McCreight [:mccr8]]

> These should stay in xpcpublic.

Just out of curiosity, why is that?  Because they morally represent the public API of XPC?

Comment 4

[Bobby Holley (:bholley)]

(In reply to Andrew McCreight [:mccr8] from comment #3)
> > These should stay in xpcpublic.
> 
> Just out of curiosity, why is that?  Because they morally represent the
> public API of XPC?

More or less - they're things that, if I were writing code in BindingsUtils.cpp or content/xbl, I would expect to be able to use.

Comment 5

[Andrew McCreight [:mccr8]]

BindingUtils.cpp already includes xpcprivate.h. ;)  But yes, that makes sense.

Comment 6

[Andrew McCreight [:mccr8]]

Attachment: move stuff

Comment 7

[Andrew McCreight [:mccr8]]

Comment on attachment 818511 [details] [diff] [review]
move stuff

Windows and Linux debug builds look ok.

https://tbpl.mozilla.org/?tree=Try&rev=6bb0b6f88eeb

Comment 8

[Andrew McCreight [:mccr8]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/04a1e2c324e8

Comment 9

[Phil Ringnalda (:philor)]

https://hg.mozilla.org/mozilla-central/rev/04a1e2c324e8