1276286 - Remove the unused JSContext goop in nsJSObjWrapper::GetNewOrUsed

Status: RESOLVED FIXED

(Core Graveyard :: Plug-ins, defect)

Comment 1

[Boris Zbarsky [:bzbarsky]]

Attachment: Remove the unused JSContext stuff in nsJSObjWrapper::GetNewOrUsed

Comment 2

[Andrew McCreight [:mccr8]]

Comment on attachment 8757390 [details] [diff] [review]
Remove the unused JSContext stuff in nsJSObjWrapper::GetNewOrUsed

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

For the record, bug 1239494 removed the last usage of cx in GetNewOrUsed.

::: dom/plugins/base/nsJSNPRuntime.cpp
@@ +597,5 @@
>    if (!obj) {
>      obj = val.toObjectOrNull();
>    }
>  
> +  NPObject *npobj = nsJSObjWrapper::GetNewOrUsed(npp, obj);

Maybe move the * over while you are touching this line.

::: dom/plugins/base/nsJSNPRuntime.h
@@ +57,5 @@
>    JS::Heap<JSObject *> mJSObj;
>    const NPP mNpp;
>    bool mDestroyPending;
>  
> +  static NPObject *GetNewOrUsed(NPP npp,  JS::Handle<JSObject*> obj);

nit: extra space before JS::Handle. Also, maybe move the * over to NPObject while you are here.

::: dom/plugins/base/nsNPAPIPlugin.cpp
@@ +1061,5 @@
>    NS_ENSURE_TRUE(doc, nullptr);
>    nsCOMPtr<nsPIDOMWindowOuter> outer = doc->GetWindow();
>    NS_ENSURE_TRUE(outer, nullptr);
>  
> +  JS::Rooted<JSObject*> global(nsContentUtils::RootingCx(),

I guess eventually Rooted won't take a cx arg, eliminating this ugliness...

Comment 3

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/8834d0097b90

Comment 4

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/8834d0097b90