861281 - GC: Root the wrap object API

Status: RESOLVED FIXED

(Core :: JavaScript Engine, defect)

Description

[Jon Coppeard (:jonco)]

Attachment: Proposed changes

Here's a patch to root the wrapping callbacks set by JS_SetWrapObjectCallbacks().

Terrence I'm running this past you first before asking for review from others.

Comment 1

[Boris Zbarsky [:bzbarsky]]

Comment on attachment 736883 [details] [diff] [review]
Proposed changes

I'd somehwat prefer we make ReparentWrapper (and RescueOrphans) take handles instead of using a RootedObject here.  Having the rooting at XPCWrappedNative::RescueOrphans (which has a marked object anyway) and nsNodeUtils::CloneAndAdopt (where it's getting the object out of something) would be a lot clearer.

Comment 2

[Terrence Cole [:terrence]]

Comment on attachment 736883 [details] [diff] [review]
Proposed changes

Review of attachment 736883 [details] [diff] [review]:
-----------------------------------------------------------------

Lets push the rooting of ReparentWrapper back one more level with this patch, as bz suggests. With that, this all looks excellent to me.

Comment 3

[Jon Coppeard (:jonco)]

(In reply to Boris Zbarsky (:bz) from comment #1)

Thanks for the comments.

I'll make ReparentWrapper take a handle, and RescueOrphans has already been changed in the meantime.

Unfortunately we still have to have a root in ReparentWrapper because aObj is assigned to.

Comment 4

[Jon Coppeard (:jonco)]

Attachment: Proposed changes v2

Comment 5

[Boris Zbarsky [:bzbarsky]]

I wonder how evil it would be to have ReparentWrapper take a mutable handle..

It probably doesn't matter much, though.  Might be worth a comment in ReparentWrapper about why we're rooting again.

Comment 6

[Bobby Holley (:bholley)]

Comment on attachment 737438 [details] [diff] [review]
Proposed changes v2

Review of attachment 737438 [details] [diff] [review]:
-----------------------------------------------------------------

::: js/xpconnect/wrappers/WrapperFactory.cpp
@@ +130,2 @@
>  {
> +    RootedObject scope(cx, scopeArg);

Rather than doing the scopeArg dance here, let's just make something new to pass to PreCreate (since we need access to the original one anyway).

Comment 7

[Jon Coppeard (:jonco)]

Patch updated and landed on unbound:

https://hg.mozilla.org/integration/mozilla-inbound/rev/3fa225a54135

Comment 8

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/3fa225a54135