Beanz/pdf.js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #18905 from Snuffleupagus/optionalContentConfig-determine-groups

Browse Source 
Reduce duplication when collecting optional content groups
This commit is contained in:
Tim van der Meij 2024-10-15 20:46:23 +02:00 committed by GitHub
commit ec79316379
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/catalog.js
View File

@ -485,19 +485,15 @@ class Catalog {
if (!Array.isArray(groupsData)) { if (!Array.isArray(groupsData)) {
return shadow(this, "optionalContentConfig", null); return shadow(this, "optionalContentConfig", null);
} }
const groups = [];
const groupRefCache = new RefSetCache(); const groupRefCache = new RefSetCache();
// Ensure all the optional content groups are valid. // Ensure all the optional content groups are valid.
for (const groupRef of groupsData) { for (const groupRef of groupsData) {
if (!(groupRef instanceof Ref) || groupRefCache.has(groupRef)) { if (!(groupRef instanceof Ref) || groupRefCache.has(groupRef)) {
continue; continue;
} }
const group = this.#readOptionalContentGroup(groupRef); groupRefCache.put(groupRef, this.#readOptionalContentGroup(groupRef));
groups.push(group);
groupRefCache.put(groupRef, group);
} }
config = this.#readOptionalContentConfig(defaultConfig, groupRefCache); config = this.#readOptionalContentConfig(defaultConfig, groupRefCache);
config.groups = groups;
} catch (ex) { } catch (ex) {
if (ex instanceof MissingDataException) { if (ex instanceof MissingDataException) {
throw ex; throw ex;
@ -649,7 +645,6 @@ class Catalog {
if (!Array.isArray(rbGroup) || !rbGroup.length) { if (!Array.isArray(rbGroup) || !rbGroup.length) {
continue; continue;
} }
const parsedRbGroup = new Set(); const parsedRbGroup = new Set();
for (const ref of rbGroup) { for (const ref of rbGroup) {
@ -688,7 +683,7 @@ class Catalog {
on: parseOnOff(config.get("ON")), on: parseOnOff(config.get("ON")),
off: parseOnOff(config.get("OFF")), off: parseOnOff(config.get("OFF")),
order: parseOrder(config.get("Order")), order: parseOrder(config.get("Order")),
groups: null, groups: [...groupRefCache],
}; };
} }