nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1896147 - Part 1: Use jsval rather than Array<jsval> for nsIJumpListBuilder.populateJumpList. r=arai

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D210055
This commit is contained in:
Mike Conley 2024-05-12 02:29:26 +00:00
parent 5c391a8748
commit 79ba2d5156
2 changed files with 51 additions and 11 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

4
widget/nsIJumpListBuilder.idl
View file

@ -100,9 +100,9 @@ interface nsIJumpListBuilder : nsISupports
*/
[implicit_jscontext]
Promise populateJumpList(
in Array<jsval> aTaskDescriptions,
in jsval aTaskDescriptions,
in AString aCustomTitle,
in Array<jsval> aCustomDescriptions
in jsval aCustomDescriptions
);
/**

58
widget/windows/JumpListBuilder.cpp
View file

@ -291,15 +291,41 @@ JumpListBuilder::CheckForRemovals(JSContext* aCx, Promise** aPromise) {
}
NS_IMETHODIMP
JumpListBuilder::PopulateJumpList(
const nsTArray<JS::Value>& aTaskDescriptions, const nsAString& aCustomTitle,
const nsTArray<JS::Value>& aCustomDescriptions, JSContext* aCx,
Promise** aPromise) {
JumpListBuilder::PopulateJumpList(JS::Handle<JS::Value> aTaskDescriptions,
const nsAString& aCustomTitle,
JS::Handle<JS::Value> aCustomDescriptions,
JSContext* aCx, Promise** aPromise) {
MOZ_ASSERT(NS_IsMainThread());
MOZ_ASSERT(aPromise);
MOZ_ASSERT(mIOThread);
if (aCustomDescriptions.Length() && aCustomTitle.IsEmpty()) {
if (!aTaskDescriptions.isObject() || !aCustomDescriptions.isObject()) {
return NS_ERROR_INVALID_ARG;
}
bool isArray;
if (!JS::IsArrayObject(aCx, aTaskDescriptions, &isArray) ||
!JS::IsArrayObject(aCx, aCustomDescriptions, &isArray)) {
return NS_ERROR_INVALID_ARG;
}
JS::Rooted<JSObject*> taskDescriptionsObj(aCx, &aTaskDescriptions.toObject());
JS::Rooted<JSObject*> customDescriptionsObj(aCx,
&aCustomDescriptions.toObject());
uint32_t taskDescriptionsLength = 0;
uint32_t customDescriptionsLength = 0;
if (NS_WARN_IF(!JS::GetArrayLength(aCx, taskDescriptionsObj,
&taskDescriptionsLength))) {
return NS_ERROR_INVALID_ARG;
}
if (NS_WARN_IF(!JS::GetArrayLength(aCx, customDescriptionsObj,
&customDescriptionsLength))) {
return NS_ERROR_INVALID_ARG;
}
if (customDescriptionsLength && aCustomTitle.IsEmpty()) {
return NS_ERROR_INVALID_ARG;
}
@ -309,9 +335,16 @@ JumpListBuilder::PopulateJumpList(
mIOThread->Dispatch(event, NS_DISPATCH_NORMAL);
nsTArray<WindowsJumpListShortcutDescription> taskDescs;
for (auto& jsval : aTaskDescriptions) {
for (uint32_t arrayIndex = 0; arrayIndex < taskDescriptionsLength;
arrayIndex++) {
JS::Rooted<JS::PropertyKey> indexId(aCx);
if (NS_WARN_IF(!JS_IndexToId(aCx, arrayIndex, &indexId))) {
return NS_ERROR_INVALID_ARG;
}
JS::Rooted<JS::Value> rootedVal(aCx);
if (NS_WARN_IF(!dom::ToJSValue(aCx, jsval, &rootedVal))) {
if (NS_WARN_IF(!JS_GetPropertyById(aCx, taskDescriptionsObj, indexId,
&rootedVal))) {
return NS_ERROR_INVALID_ARG;
}
@ -324,9 +357,16 @@ JumpListBuilder::PopulateJumpList(
}
nsTArray<WindowsJumpListShortcutDescription> customDescs;
for (auto& jsval : aCustomDescriptions) {
for (uint32_t arrayIndex = 0; arrayIndex < customDescriptionsLength;
arrayIndex++) {
JS::Rooted<JS::PropertyKey> indexId(aCx);
if (NS_WARN_IF(!JS_IndexToId(aCx, arrayIndex, &indexId))) {
return NS_ERROR_INVALID_ARG;
}
JS::Rooted<JS::Value> rootedVal(aCx);
if (NS_WARN_IF(!dom::ToJSValue(aCx, jsval, &rootedVal))) {
if (NS_WARN_IF(!JS_GetPropertyById(aCx, customDescriptionsObj, indexId,
&rootedVal))) {
return NS_ERROR_INVALID_ARG;
}