Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing bug 233307. deCOMtaminating nsIScript* and related interfaces. r+sr=bryner@brianryner.com.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@152565 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jst%mozilla.jstenback.com
2004-02-09 22:48:53 +00:00
parent a14daeb4f5
commit 854468a176
116 changed files with 1255 additions and 1707 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
View File

@@ -5642,10 +5642,7 @@ NS_IMETHODIMP nsPluginHostImpl::NewPluginURLStream(const nsString& aURL,
if (global)
{
nsCOMPtr<nsIScriptGlobalObjectOwner> owner;
global->GetGlobalObjectOwner(getter_AddRefs(owner));
callbacks = do_QueryInterface(owner);
callbacks = do_QueryInterface(global->GetGlobalObjectOwner());
}
}

9
mozilla/modules/plugin/base/src/nsPluginInstancePeer.cpp
View File

@@ -773,13 +773,10 @@ NS_IMETHODIMP nsPluginInstancePeerImpl::GetJSContext(JSContext* *outContext)
nsIScriptGlobalObject *global = document->GetScriptGlobalObject();
if (global) {
nsCOMPtr<nsIScriptContext> context;
nsIScriptContext *context = global->GetContext();
if (global->GetContext(getter_AddRefs(context)) == NS_OK) {
if (context) {
*outContext = (JSContext*) context->GetNativeContext();
rv = NS_OK;
}
if (context) {
*outContext = (JSContext*) context->GetNativeContext();
}
}
}