mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-15 06:15:43 +00:00
Fix for bug 852979 (Remove unused nsContentUtils::JSArrayToAtomArray). r=smaug.
--HG-- extra : rebase_source : c61c3477d5686956a44d45685c59c0a3415dc3c3
This commit is contained in:
parent
76677cff1a
commit
c3d9bfaa96
@ -1996,13 +1996,6 @@ public:
|
||||
static nsresult Atob(const nsAString& aAsciiString,
|
||||
nsAString& aBinaryData);
|
||||
|
||||
/** If aJSArray is a Javascript array, this method iterates over its
|
||||
* elements and appends values to aRetVal as nsIAtoms.
|
||||
* @throw NS_ERROR_ILLEGAL_VALUE if aJSArray isn't a JS array.
|
||||
*/
|
||||
static nsresult JSArrayToAtomArray(JSContext* aCx, const JS::Value& aJSArray,
|
||||
nsCOMArray<nsIAtom>& aRetVal);
|
||||
|
||||
/**
|
||||
* Returns whether the input element passed in parameter has the autocomplete
|
||||
* functionality enabled. It is taking into account the form owner.
|
||||
|
@ -6706,46 +6706,6 @@ nsContentUtils::TraceWrapper(nsWrapperCache* aCache, TraceCallback aCallback,
|
||||
}
|
||||
}
|
||||
|
||||
nsresult
|
||||
nsContentUtils::JSArrayToAtomArray(JSContext* aCx, const JS::Value& aJSArray,
|
||||
nsCOMArray<nsIAtom>& aRetVal)
|
||||
{
|
||||
JSAutoRequest ar(aCx);
|
||||
if (!aJSArray.isObject()) {
|
||||
return NS_ERROR_ILLEGAL_VALUE;
|
||||
}
|
||||
|
||||
JSObject* obj = &aJSArray.toObject();
|
||||
JSAutoCompartment ac(aCx, obj);
|
||||
|
||||
uint32_t length;
|
||||
if (!JS_IsArrayObject(aCx, obj) || !JS_GetArrayLength(aCx, obj, &length)) {
|
||||
return NS_ERROR_ILLEGAL_VALUE;
|
||||
}
|
||||
|
||||
JSString* str = nullptr;
|
||||
JS::Anchor<JSString *> deleteProtector(str);
|
||||
for (uint32_t i = 0; i < length; ++i) {
|
||||
jsval v;
|
||||
if (!JS_GetElement(aCx, obj, i, &v) ||
|
||||
!(str = JS_ValueToString(aCx, v))) {
|
||||
return NS_ERROR_ILLEGAL_VALUE;
|
||||
}
|
||||
|
||||
nsDependentJSString depStr;
|
||||
if (!depStr.init(aCx, str)) {
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
}
|
||||
|
||||
nsCOMPtr<nsIAtom> a = do_GetAtom(depStr);
|
||||
if (!a) {
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
}
|
||||
aRetVal.AppendObject(a);
|
||||
}
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
// static
|
||||
void
|
||||
nsContentUtils::GetSelectionInTextControl(Selection* aSelection,
|
||||
|
Loading…
Reference in New Issue
Block a user