corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 873698 - Remove JS_GetGlobalObject from plugins. r=gabor

Browse Source
This commit is contained in:
Bobby Holley
2013-05-22 15:42:44 -06:00
parent 0dfa3a75fe
commit e165009bf2
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
dom/plugins/base/nsNPAPIPlugin.cpp
View File

@@ -29,6 +29,7 @@
#include "nsIDOMElement.h"
#include "nsPIDOMWindow.h"
#include "nsGlobalWindow.h"
#include "nsIDocument.h"
#include "nsIContent.h"
#include "nsIScriptGlobalObject.h"
@@ -1206,13 +1207,16 @@ _getwindowobject(NPP npp)
NPN_PLUGIN_LOG(PLUGIN_LOG_ALWAYS,("NPN_getwindowobject called from the wrong thread\n"));
return nullptr;
}
AutoPushJSContext cx(GetJSContextFromNPP(npp));
NS_ENSURE_TRUE(cx, nullptr);
// Using ::JS_GetGlobalObject(cx) is ok here since the window we
// want to return here is the outer window, *not* the inner (since
// The window want to return here is the outer window, *not* the inner (since
// we don't know what the plugin will do with it).
JS::Rooted<JSObject*> global(cx, ::JS_GetGlobalObject(cx));
nsIDocument* doc = GetDocumentFromNPP(npp);
NS_ENSURE_TRUE(doc, nullptr);
nsCOMPtr<nsPIDOMWindow> outer = do_QueryInterface(doc->GetWindow());
NS_ENSURE_TRUE(outer, nullptr);
AutoJSContext cx;
JS::Rooted<JSObject*> global(cx, static_cast<nsGlobalWindow*>(outer.get())->GetGlobalJSObject());
return nsJSObjWrapper::GetNewOrUsed(npp, cx, global);
}
@@ -1236,12 +1240,13 @@ _getpluginelement(NPP npp)
AutoPushJSContext cx(GetJSContextFromNPP(npp));
NS_ENSURE_TRUE(cx, nullptr);
JSAutoRequest ar(cx); // Unnecessary once bug 868130 lands.
nsCOMPtr<nsIXPConnect> xpc(do_GetService(nsIXPConnect::GetCID()));
NS_ENSURE_TRUE(xpc, nullptr);
nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
xpc->WrapNative(cx, ::JS_GetGlobalObject(cx), element,
xpc->WrapNative(cx, ::JS_GetGlobalForScopeChain(cx), element,
NS_GET_IID(nsIDOMElement),
getter_AddRefs(holder));
NS_ENSURE_TRUE(holder, nullptr);