mirror of
https://github.com/mozilla/pdf.js.git
synced 2025-04-21 23:58:07 +02:00
Send the AnnotationStorage-data to the worker-thread as a Map
Rather than converting the `AnnotationStorage`-data to an Object, before sending it to the worker-thread, we should be able to simply send the internal `Map` directly. The "structured clone algorithm" doesn't have a problem with `Map`s, however the `LoopbackPort` used when workers are *disabled* (e.g. in Node.js environments) didn't use to support them. With PR 12997 having lifted that restriction, we should now be able to simply send the `AnnotationStorage`-data as-is rather than having to iterate through it to first create an Object. *Please note:* The changes in `src/core/annotation.js` could have been a lot more compact if we were able to use optional chaining in the `src/core` folder. Unfortunately that's still not possible, since SystemJS is being used in the development viewer (i.g. `gulp server`) and fixing that is *still* blocked by [bug 1247687](https://bugzilla.mozilla.org/show_bug.cgi?id=1247687).
This commit is contained in:
Jonas Jenwald
parent
0fa9976268
commit
e9038cc3d1
4 changed files with 133 additions and 89 deletions
|
|
@ -1672,9 +1672,9 @@ describe("annotation", function () {
|
|||
idFactoryMock
|
||||
)
|
||||
.then(annotation => {
|
||||
const id = annotation.data.id;
|
||||
const annotationStorage = {};
|
||||
annotationStorage[id] = { value: "test\\print" };
|
||||
const annotationStorage = new Map();
|
||||
annotationStorage.set(annotation.data.id, { value: "test\\print" });
|
||||
|
||||
return annotation._getAppearance(
|
||||
partialEvaluator,
|
||||
task,
|
||||
|
|
@ -1709,9 +1709,11 @@ describe("annotation", function () {
|
|||
idFactoryMock
|
||||
)
|
||||
.then(annotation => {
|
||||
const id = annotation.data.id;
|
||||
const annotationStorage = {};
|
||||
annotationStorage[id] = { value: "こんにちは世界の" };
|
||||
const annotationStorage = new Map();
|
||||
annotationStorage.set(annotation.data.id, {
|
||||
value: "こんにちは世界の",
|
||||
});
|
||||
|
||||
return annotation._getAppearance(
|
||||
partialEvaluator,
|
||||
task,
|
||||
|
|
@ -1756,7 +1758,8 @@ describe("annotation", function () {
|
|||
idFactoryMock
|
||||
)
|
||||
.then(annotation => {
|
||||
const annotationStorage = {};
|
||||
const annotationStorage = new Map();
|
||||
|
||||
return annotation.getOperatorList(
|
||||
partialEvaluator,
|
||||
task,
|
||||
|
|
@ -1797,9 +1800,9 @@ describe("annotation", function () {
|
|||
idFactoryMock
|
||||
)
|
||||
.then(annotation => {
|
||||
const id = annotation.data.id;
|
||||
const annotationStorage = {};
|
||||
annotationStorage[id] = { value: "test (print)" };
|
||||
const annotationStorage = new Map();
|
||||
annotationStorage.set(annotation.data.id, { value: "test (print)" });
|
||||
|
||||
return annotation._getAppearance(
|
||||
partialEvaluator,
|
||||
task,
|
||||
|
|
@ -1834,9 +1837,11 @@ describe("annotation", function () {
|
|||
idFactoryMock
|
||||
)
|
||||
.then(annotation => {
|
||||
const id = annotation.data.id;
|
||||
const annotationStorage = {};
|
||||
annotationStorage[id] = { value: "こんにちは世界の" };
|
||||
const annotationStorage = new Map();
|
||||
annotationStorage.set(annotation.data.id, {
|
||||
value: "こんにちは世界の",
|
||||
});
|
||||
|
||||
return annotation._getAppearance(
|
||||
partialEvaluator,
|
||||
task,
|
||||
|
|
@ -1873,9 +1878,9 @@ describe("annotation", function () {
|
|||
idFactoryMock
|
||||
)
|
||||
.then(annotation => {
|
||||
const id = annotation.data.id;
|
||||
const annotationStorage = {};
|
||||
annotationStorage[id] = { value: "mypassword" };
|
||||
const annotationStorage = new Map();
|
||||
annotationStorage.set(annotation.data.id, { value: "mypassword" });
|
||||
|
||||
return annotation._getAppearance(
|
||||
partialEvaluator,
|
||||
task,
|
||||
|
|
@ -1906,13 +1911,13 @@ describe("annotation", function () {
|
|||
idFactoryMock
|
||||
)
|
||||
.then(annotation => {
|
||||
const id = annotation.data.id;
|
||||
const annotationStorage = {};
|
||||
annotationStorage[id] = {
|
||||
const annotationStorage = new Map();
|
||||
annotationStorage.set(annotation.data.id, {
|
||||
value:
|
||||
"a aa aaa aaaa aaaaa aaaaaa " +
|
||||
"pneumonoultramicroscopicsilicovolcanoconiosis",
|
||||
};
|
||||
});
|
||||
|
||||
return annotation._getAppearance(
|
||||
partialEvaluator,
|
||||
task,
|
||||
|
|
@ -1954,9 +1959,11 @@ describe("annotation", function () {
|
|||
idFactoryMock
|
||||
)
|
||||
.then(annotation => {
|
||||
const id = annotation.data.id;
|
||||
const annotationStorage = {};
|
||||
annotationStorage[id] = { value: "こんにちは世界の" };
|
||||
const annotationStorage = new Map();
|
||||
annotationStorage.set(annotation.data.id, {
|
||||
value: "こんにちは世界の",
|
||||
});
|
||||
|
||||
return annotation._getAppearance(
|
||||
partialEvaluator,
|
||||
task,
|
||||
|
|
@ -2014,9 +2021,8 @@ describe("annotation", function () {
|
|||
idFactoryMock
|
||||
)
|
||||
.then(annotation => {
|
||||
const id = annotation.data.id;
|
||||
const annotationStorage = {};
|
||||
annotationStorage[id] = {
|
||||
const annotationStorage = new Map();
|
||||
annotationStorage.set(annotation.data.id, {
|
||||
value:
|
||||
"Lorem ipsum dolor sit amet, consectetur adipiscing elit.\r" +
|
||||
"Aliquam vitae felis ac lectus bibendum ultricies quis non diam.\n" +
|
||||
|
|
@ -2026,7 +2032,8 @@ describe("annotation", function () {
|
|||
"Nulla consectetur, ligula in tincidunt placerat, " +
|
||||
"velit augue consectetur orci, sed mattis libero nunc ut massa.\r" +
|
||||
"Etiam facilisis tempus interdum.",
|
||||
};
|
||||
});
|
||||
|
||||
return annotation._getAppearance(
|
||||
partialEvaluator,
|
||||
task,
|
||||
|
|
@ -2058,9 +2065,9 @@ describe("annotation", function () {
|
|||
idFactoryMock
|
||||
)
|
||||
.then(annotation => {
|
||||
const id = annotation.data.id;
|
||||
const annotationStorage = {};
|
||||
annotationStorage[id] = { value: "aa(aa)a\\" };
|
||||
const annotationStorage = new Map();
|
||||
annotationStorage.set(annotation.data.id, { value: "aa(aa)a\\" });
|
||||
|
||||
return annotation._getAppearance(
|
||||
partialEvaluator,
|
||||
task,
|
||||
|
|
@ -2101,9 +2108,11 @@ describe("annotation", function () {
|
|||
idFactoryMock
|
||||
)
|
||||
.then(annotation => {
|
||||
const id = annotation.data.id;
|
||||
const annotationStorage = {};
|
||||
annotationStorage[id] = { value: "こんにちは世界の" };
|
||||
const annotationStorage = new Map();
|
||||
annotationStorage.set(annotation.data.id, {
|
||||
value: "こんにちは世界の",
|
||||
});
|
||||
|
||||
return annotation._getAppearance(
|
||||
partialEvaluator,
|
||||
task,
|
||||
|
|
@ -2138,8 +2147,9 @@ describe("annotation", function () {
|
|||
idFactoryMock
|
||||
)
|
||||
.then(annotation => {
|
||||
const annotationStorage = {};
|
||||
annotationStorage[annotation.data.id] = { value: "hello world" };
|
||||
const annotationStorage = new Map();
|
||||
annotationStorage.set(annotation.data.id, { value: "hello world" });
|
||||
|
||||
return annotation.save(partialEvaluator, task, annotationStorage);
|
||||
}, done.fail)
|
||||
.then(data => {
|
||||
|
|
@ -2270,8 +2280,11 @@ describe("annotation", function () {
|
|||
idFactoryMock
|
||||
)
|
||||
.then(annotation => {
|
||||
const annotationStorage = {};
|
||||
annotationStorage[annotation.data.id] = { value: "こんにちは世界の" };
|
||||
const annotationStorage = new Map();
|
||||
annotationStorage.set(annotation.data.id, {
|
||||
value: "こんにちは世界の",
|
||||
});
|
||||
|
||||
return annotation.save(partialEvaluator, task, annotationStorage);
|
||||
}, done.fail)
|
||||
.then(data => {
|
||||
|
|
@ -2440,8 +2453,9 @@ describe("annotation", function () {
|
|||
idFactoryMock
|
||||
)
|
||||
.then(annotation => {
|
||||
const annotationStorage = {};
|
||||
annotationStorage[annotation.data.id] = { value: true };
|
||||
const annotationStorage = new Map();
|
||||
annotationStorage.set(annotation.data.id, { value: true });
|
||||
|
||||
return annotation.getOperatorList(
|
||||
partialEvaluator,
|
||||
task,
|
||||
|
|
@ -2498,8 +2512,9 @@ describe("annotation", function () {
|
|||
idFactoryMock
|
||||
)
|
||||
.then(annotation => {
|
||||
const annotationStorage = {};
|
||||
annotationStorage[annotation.data.id] = { value: true };
|
||||
const annotationStorage = new Map();
|
||||
annotationStorage.set(annotation.data.id, { value: true });
|
||||
|
||||
return Promise.all([
|
||||
annotation,
|
||||
annotation.getOperatorList(
|
||||
|
|
@ -2523,8 +2538,9 @@ describe("annotation", function () {
|
|||
return annotation;
|
||||
}, done.fail)
|
||||
.then(annotation => {
|
||||
const annotationStorage = {};
|
||||
annotationStorage[annotation.data.id] = { value: false };
|
||||
const annotationStorage = new Map();
|
||||
annotationStorage.set(annotation.data.id, { value: false });
|
||||
|
||||
return annotation.getOperatorList(
|
||||
partialEvaluator,
|
||||
task,
|
||||
|
|
@ -2581,8 +2597,9 @@ describe("annotation", function () {
|
|||
idFactoryMock
|
||||
)
|
||||
.then(annotation => {
|
||||
const annotationStorage = {};
|
||||
annotationStorage[annotation.data.id] = { value: true };
|
||||
const annotationStorage = new Map();
|
||||
annotationStorage.set(annotation.data.id, { value: true });
|
||||
|
||||
return Promise.all([
|
||||
annotation,
|
||||
annotation.getOperatorList(
|
||||
|
|
@ -2606,8 +2623,9 @@ describe("annotation", function () {
|
|||
return annotation;
|
||||
})
|
||||
.then(annotation => {
|
||||
const annotationStorage = {};
|
||||
annotationStorage[annotation.data.id] = { value: true };
|
||||
const annotationStorage = new Map();
|
||||
annotationStorage.set(annotation.data.id, { value: true });
|
||||
|
||||
return annotation.getOperatorList(
|
||||
partialEvaluator,
|
||||
task,
|
||||
|
|
@ -2665,7 +2683,8 @@ describe("annotation", function () {
|
|||
idFactoryMock
|
||||
)
|
||||
.then(annotation => {
|
||||
const annotationStorage = {};
|
||||
const annotationStorage = new Map();
|
||||
|
||||
return annotation.getOperatorList(
|
||||
partialEvaluator,
|
||||
task,
|
||||
|
|
@ -2713,8 +2732,9 @@ describe("annotation", function () {
|
|||
idFactoryMock
|
||||
)
|
||||
.then(annotation => {
|
||||
const annotationStorage = {};
|
||||
annotationStorage[annotation.data.id] = { value: true };
|
||||
const annotationStorage = new Map();
|
||||
annotationStorage.set(annotation.data.id, { value: true });
|
||||
|
||||
return Promise.all([
|
||||
annotation,
|
||||
annotation.save(partialEvaluator, task, annotationStorage),
|
||||
|
|
@ -2732,8 +2752,9 @@ describe("annotation", function () {
|
|||
return annotation;
|
||||
}, done.fail)
|
||||
.then(annotation => {
|
||||
const annotationStorage = {};
|
||||
annotationStorage[annotation.data.id] = { value: false };
|
||||
const annotationStorage = new Map();
|
||||
annotationStorage.set(annotation.data.id, { value: false });
|
||||
|
||||
return annotation.save(partialEvaluator, task, annotationStorage);
|
||||
}, done.fail)
|
||||
.then(data => {
|
||||
|
|
@ -2875,8 +2896,9 @@ describe("annotation", function () {
|
|||
idFactoryMock
|
||||
)
|
||||
.then(annotation => {
|
||||
const annotationStorage = {};
|
||||
annotationStorage[annotation.data.id] = { value: true };
|
||||
const annotationStorage = new Map();
|
||||
annotationStorage.set(annotation.data.id, { value: true });
|
||||
|
||||
return Promise.all([
|
||||
annotation,
|
||||
annotation.getOperatorList(
|
||||
|
|
@ -2900,8 +2922,9 @@ describe("annotation", function () {
|
|||
return annotation;
|
||||
}, done.fail)
|
||||
.then(annotation => {
|
||||
const annotationStorage = {};
|
||||
annotationStorage[annotation.data.id] = { value: false };
|
||||
const annotationStorage = new Map();
|
||||
annotationStorage.set(annotation.data.id, { value: false });
|
||||
|
||||
return annotation.getOperatorList(
|
||||
partialEvaluator,
|
||||
task,
|
||||
|
|
@ -2959,7 +2982,8 @@ describe("annotation", function () {
|
|||
idFactoryMock
|
||||
)
|
||||
.then(annotation => {
|
||||
const annotationStorage = {};
|
||||
const annotationStorage = new Map();
|
||||
|
||||
return annotation.getOperatorList(
|
||||
partialEvaluator,
|
||||
task,
|
||||
|
|
@ -3018,8 +3042,9 @@ describe("annotation", function () {
|
|||
idFactoryMock
|
||||
)
|
||||
.then(annotation => {
|
||||
const annotationStorage = {};
|
||||
annotationStorage[annotation.data.id] = { value: true };
|
||||
const annotationStorage = new Map();
|
||||
annotationStorage.set(annotation.data.id, { value: true });
|
||||
|
||||
return Promise.all([
|
||||
annotation,
|
||||
annotation.save(partialEvaluator, task, annotationStorage),
|
||||
|
|
@ -3044,8 +3069,9 @@ describe("annotation", function () {
|
|||
return annotation;
|
||||
}, done.fail)
|
||||
.then(annotation => {
|
||||
const annotationStorage = {};
|
||||
annotationStorage[annotation.data.id] = { value: false };
|
||||
const annotationStorage = new Map();
|
||||
annotationStorage.set(annotation.data.id, { value: false });
|
||||
|
||||
return annotation.save(partialEvaluator, task, annotationStorage);
|
||||
}, done.fail)
|
||||
.then(data => {
|
||||
|
|
@ -3089,8 +3115,9 @@ describe("annotation", function () {
|
|||
idFactoryMock
|
||||
)
|
||||
.then(annotation => {
|
||||
const annotationStorage = {};
|
||||
annotationStorage[annotation.data.id] = { value: true };
|
||||
const annotationStorage = new Map();
|
||||
annotationStorage.set(annotation.data.id, { value: true });
|
||||
|
||||
return Promise.all([
|
||||
annotation,
|
||||
annotation.save(partialEvaluator, task, annotationStorage),
|
||||
|
|
@ -3130,7 +3157,9 @@ describe("annotation", function () {
|
|||
idFactoryMock
|
||||
)
|
||||
.then(annotation => {
|
||||
return annotation.save(partialEvaluator, task, {});
|
||||
const annotationStorage = new Map();
|
||||
|
||||
return annotation.save(partialEvaluator, task, annotationStorage);
|
||||
})
|
||||
.then(data => {
|
||||
expect(data).toEqual(null);
|
||||
|
|
@ -3535,9 +3564,9 @@ describe("annotation", function () {
|
|||
idFactoryMock
|
||||
)
|
||||
.then(annotation => {
|
||||
const id = annotation.data.id;
|
||||
const annotationStorage = {};
|
||||
annotationStorage[id] = { value: "a value" };
|
||||
const annotationStorage = new Map();
|
||||
annotationStorage.set(annotation.data.id, { value: "a value" });
|
||||
|
||||
return annotation._getAppearance(
|
||||
partialEvaluator,
|
||||
task,
|
||||
|
|
@ -3571,8 +3600,9 @@ describe("annotation", function () {
|
|||
idFactoryMock
|
||||
)
|
||||
.then(annotation => {
|
||||
const annotationStorage = {};
|
||||
annotationStorage[annotation.data.id] = { value: "C" };
|
||||
const annotationStorage = new Map();
|
||||
annotationStorage.set(annotation.data.id, { value: "C" });
|
||||
|
||||
return annotation.save(partialEvaluator, task, annotationStorage);
|
||||
}, done.fail)
|
||||
.then(data => {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue