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

backing out

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@248864 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
timeless%mozdev.org 2008-03-30 14:41:47 +00:00
parent 8a1c7f5713
commit 61a5f8d8da
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mozilla/modules/plugin/base/src/ns4xPlugin.cpp
View File

@ -1471,7 +1471,7 @@ doGetIdentifier(JSContext *cx, const NPUTF8* name)
utf16name.Length());
if (!str)
return NULL;
return nsnull;
return (NPIdentifier)STRING_TO_JSVAL(str);
}
@ -1479,11 +1479,6 @@ doGetIdentifier(JSContext *cx, const NPUTF8* name)
NPIdentifier NP_CALLBACK
_getstringidentifier(const NPUTF8* name)
{
if (!name) {
NPN_PLUGIN_LOG(PLUGIN_LOG_ALWAYS, ("NPN_getstringidentifier: passed null name"));
return NULL;
}
nsCOMPtr<nsIThreadJSContextStack> stack =
do_GetService("@mozilla.org/js/xpc/ContextStack;1");
if (!stack)
@ -1515,13 +1510,7 @@ _getstringidentifiers(const NPUTF8** names, int32_t nameCount,
JSAutoRequest ar(cx);
for (int32_t i = 0; i < nameCount; ++i) {
if (names[i]) {
identifiers[i] = doGetIdentifier(cx, names[i]);
} else {
NPN_PLUGIN_LOG(PLUGIN_LOG_ALWAYS, ("NPN_getstringidentifiers: passed null nam
e"));
identifiers[i] = NULL;
}
identifiers[i] = doGetIdentifier(cx, names[i]);
}
}