160cfc4084
Note that `Dict.set` will only be called with values returned through `Parser.getObj`, and thus indirectly via `Lexer.getObj`. Since neither of those methods will ever return `undefined`, we can simply assert that that's the case when inserting data into the `Dict` and thus get rid of `in` checks when doing the data lookups. In this case, since `Dict.set` is fairly hot, the patch utilizes an *inline check* and when necessary a direct call to `unreachable` to not affect performance of `gulp server/test` too much (rather than always just calling `assert`). For very large and complex PDF files this will help performance *slightly*, since `Dict.{get, getAsync, has}` is called *a lot* during parsing in the worker. This patch was tested using the PDF file from issue 2618, i.e. http://bugzilla-attachments.gnome.org/attachment.cgi?id=226471, with the following manifest file: ``` [ { "id": "issue2618", "file": "../web/pdfs/issue2618.pdf", "md5": "", "rounds": 250, "type": "eq" } ] ``` which gave the following results when comparing this patch against the `master` branch: ``` -- Grouped By browser, stat -- browser | stat | Count | Baseline(ms) | Current(ms) | +/- | % | Result(P<.05) ------- | ------------ | ----- | ------------ | ----------- | --- | ----- | ------------- Firefox | Overall | 250 | 2838 | 2820 | -18 | -0.65 | faster Firefox | Page Request | 250 | 1 | 2 | 0 | 11.92 | slower Firefox | Rendering | 250 | 2837 | 2818 | -19 | -0.65 | faster ```
388 lines
12 KiB
JavaScript
388 lines
12 KiB
JavaScript
/* Copyright 2017 Mozilla Foundation
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
import {
|
|
Cmd,
|
|
Dict,
|
|
isCmd,
|
|
isDict,
|
|
isName,
|
|
isRef,
|
|
isRefsEqual,
|
|
Name,
|
|
Ref,
|
|
RefSet,
|
|
} from "../../src/core/primitives.js";
|
|
import { XRefMock } from "./test_utils.js";
|
|
|
|
describe("primitives", function() {
|
|
describe("Name", function() {
|
|
it("should retain the given name", function() {
|
|
var givenName = "Font";
|
|
var name = Name.get(givenName);
|
|
expect(name.name).toEqual(givenName);
|
|
});
|
|
|
|
it("should create only one object for a name and cache it", function() {
|
|
var firstFont = Name.get("Font");
|
|
var secondFont = Name.get("Font");
|
|
var firstSubtype = Name.get("Subtype");
|
|
var secondSubtype = Name.get("Subtype");
|
|
|
|
expect(firstFont).toBe(secondFont);
|
|
expect(firstSubtype).toBe(secondSubtype);
|
|
expect(firstFont).not.toBe(firstSubtype);
|
|
});
|
|
});
|
|
|
|
describe("Cmd", function() {
|
|
it("should retain the given cmd name", function() {
|
|
var givenCmd = "BT";
|
|
var cmd = Cmd.get(givenCmd);
|
|
expect(cmd.cmd).toEqual(givenCmd);
|
|
});
|
|
|
|
it("should create only one object for a command and cache it", function() {
|
|
var firstBT = Cmd.get("BT");
|
|
var secondBT = Cmd.get("BT");
|
|
var firstET = Cmd.get("ET");
|
|
var secondET = Cmd.get("ET");
|
|
|
|
expect(firstBT).toBe(secondBT);
|
|
expect(firstET).toBe(secondET);
|
|
expect(firstBT).not.toBe(firstET);
|
|
});
|
|
});
|
|
|
|
describe("Dict", function() {
|
|
var checkInvalidHasValues = function(dict) {
|
|
expect(dict.has()).toBeFalsy();
|
|
expect(dict.has("Prev")).toBeFalsy();
|
|
};
|
|
|
|
var checkInvalidKeyValues = function(dict) {
|
|
expect(dict.get()).toBeUndefined();
|
|
expect(dict.get("Prev")).toBeUndefined();
|
|
expect(dict.get("Decode", "D")).toBeUndefined();
|
|
expect(dict.get("FontFile", "FontFile2", "FontFile3")).toBeUndefined();
|
|
};
|
|
|
|
var emptyDict, dictWithSizeKey, dictWithManyKeys;
|
|
var storedSize = 42;
|
|
var testFontFile = "file1";
|
|
var testFontFile2 = "file2";
|
|
var testFontFile3 = "file3";
|
|
|
|
beforeAll(function(done) {
|
|
emptyDict = new Dict();
|
|
|
|
dictWithSizeKey = new Dict();
|
|
dictWithSizeKey.set("Size", storedSize);
|
|
|
|
dictWithManyKeys = new Dict();
|
|
dictWithManyKeys.set("FontFile", testFontFile);
|
|
dictWithManyKeys.set("FontFile2", testFontFile2);
|
|
dictWithManyKeys.set("FontFile3", testFontFile3);
|
|
|
|
done();
|
|
});
|
|
|
|
afterAll(function() {
|
|
emptyDict = dictWithSizeKey = dictWithManyKeys = null;
|
|
});
|
|
|
|
it("should return invalid values for unknown keys", function() {
|
|
checkInvalidHasValues(emptyDict);
|
|
checkInvalidKeyValues(emptyDict);
|
|
});
|
|
|
|
it("should return correct value for stored Size key", function() {
|
|
expect(dictWithSizeKey.has("Size")).toBeTruthy();
|
|
|
|
expect(dictWithSizeKey.get("Size")).toEqual(storedSize);
|
|
expect(dictWithSizeKey.get("Prev", "Size")).toEqual(storedSize);
|
|
expect(dictWithSizeKey.get("Prev", "Root", "Size")).toEqual(storedSize);
|
|
});
|
|
|
|
it("should return invalid values for unknown keys when Size key is stored", function() {
|
|
checkInvalidHasValues(dictWithSizeKey);
|
|
checkInvalidKeyValues(dictWithSizeKey);
|
|
});
|
|
|
|
it("should not accept to set a key with an undefined value", function() {
|
|
const dict = new Dict();
|
|
expect(function() {
|
|
dict.set("Size");
|
|
}).toThrow(new Error('Dict.set: The "value" cannot be undefined.'));
|
|
|
|
expect(dict.has("Size")).toBeFalsy();
|
|
|
|
checkInvalidKeyValues(dict);
|
|
});
|
|
|
|
it("should return correct values for multiple stored keys", function() {
|
|
expect(dictWithManyKeys.has("FontFile")).toBeTruthy();
|
|
expect(dictWithManyKeys.has("FontFile2")).toBeTruthy();
|
|
expect(dictWithManyKeys.has("FontFile3")).toBeTruthy();
|
|
|
|
expect(dictWithManyKeys.get("FontFile3")).toEqual(testFontFile3);
|
|
expect(dictWithManyKeys.get("FontFile2", "FontFile3")).toEqual(
|
|
testFontFile2
|
|
);
|
|
expect(
|
|
dictWithManyKeys.get("FontFile", "FontFile2", "FontFile3")
|
|
).toEqual(testFontFile);
|
|
});
|
|
|
|
it("should asynchronously fetch unknown keys", function(done) {
|
|
var keyPromises = [
|
|
dictWithManyKeys.getAsync("Size"),
|
|
dictWithSizeKey.getAsync("FontFile", "FontFile2", "FontFile3"),
|
|
];
|
|
|
|
Promise.all(keyPromises)
|
|
.then(function(values) {
|
|
expect(values[0]).toBeUndefined();
|
|
expect(values[1]).toBeUndefined();
|
|
done();
|
|
})
|
|
.catch(function(reason) {
|
|
done.fail(reason);
|
|
});
|
|
});
|
|
|
|
it("should asynchronously fetch correct values for multiple stored keys", function(done) {
|
|
var keyPromises = [
|
|
dictWithManyKeys.getAsync("FontFile3"),
|
|
dictWithManyKeys.getAsync("FontFile2", "FontFile3"),
|
|
dictWithManyKeys.getAsync("FontFile", "FontFile2", "FontFile3"),
|
|
];
|
|
|
|
Promise.all(keyPromises)
|
|
.then(function(values) {
|
|
expect(values[0]).toEqual(testFontFile3);
|
|
expect(values[1]).toEqual(testFontFile2);
|
|
expect(values[2]).toEqual(testFontFile);
|
|
done();
|
|
})
|
|
.catch(function(reason) {
|
|
done.fail(reason);
|
|
});
|
|
});
|
|
|
|
it("should callback for each stored key", function() {
|
|
var callbackSpy = jasmine.createSpy("spy on callback in dictionary");
|
|
|
|
dictWithManyKeys.forEach(callbackSpy);
|
|
|
|
expect(callbackSpy).toHaveBeenCalled();
|
|
var callbackSpyCalls = callbackSpy.calls;
|
|
expect(callbackSpyCalls.argsFor(0)).toEqual(["FontFile", testFontFile]);
|
|
expect(callbackSpyCalls.argsFor(1)).toEqual(["FontFile2", testFontFile2]);
|
|
expect(callbackSpyCalls.argsFor(2)).toEqual(["FontFile3", testFontFile3]);
|
|
expect(callbackSpyCalls.count()).toEqual(3);
|
|
});
|
|
|
|
it("should handle keys pointing to indirect objects, both sync and async", function(done) {
|
|
var fontRef = Ref.get(1, 0);
|
|
var xref = new XRefMock([{ ref: fontRef, data: testFontFile }]);
|
|
var fontDict = new Dict(xref);
|
|
fontDict.set("FontFile", fontRef);
|
|
|
|
expect(fontDict.getRaw("FontFile")).toEqual(fontRef);
|
|
expect(fontDict.get("FontFile", "FontFile2", "FontFile3")).toEqual(
|
|
testFontFile
|
|
);
|
|
|
|
fontDict
|
|
.getAsync("FontFile", "FontFile2", "FontFile3")
|
|
.then(function(value) {
|
|
expect(value).toEqual(testFontFile);
|
|
done();
|
|
})
|
|
.catch(function(reason) {
|
|
done.fail(reason);
|
|
});
|
|
});
|
|
|
|
it("should handle arrays containing indirect objects", function() {
|
|
var minCoordRef = Ref.get(1, 0),
|
|
maxCoordRef = Ref.get(2, 0);
|
|
var minCoord = 0,
|
|
maxCoord = 1;
|
|
var xref = new XRefMock([
|
|
{ ref: minCoordRef, data: minCoord },
|
|
{ ref: maxCoordRef, data: maxCoord },
|
|
]);
|
|
var xObjectDict = new Dict(xref);
|
|
xObjectDict.set("BBox", [minCoord, maxCoord, minCoordRef, maxCoordRef]);
|
|
|
|
expect(xObjectDict.get("BBox")).toEqual([
|
|
minCoord,
|
|
maxCoord,
|
|
minCoordRef,
|
|
maxCoordRef,
|
|
]);
|
|
expect(xObjectDict.getArray("BBox")).toEqual([
|
|
minCoord,
|
|
maxCoord,
|
|
minCoord,
|
|
maxCoord,
|
|
]);
|
|
});
|
|
|
|
it("should get all key names", function() {
|
|
var expectedKeys = ["FontFile", "FontFile2", "FontFile3"];
|
|
var keys = dictWithManyKeys.getKeys();
|
|
|
|
expect(keys.sort()).toEqual(expectedKeys);
|
|
});
|
|
|
|
it("should create only one object for Dict.empty", function() {
|
|
var firstDictEmpty = Dict.empty;
|
|
var secondDictEmpty = Dict.empty;
|
|
|
|
expect(firstDictEmpty).toBe(secondDictEmpty);
|
|
expect(firstDictEmpty).not.toBe(emptyDict);
|
|
});
|
|
|
|
it("should correctly merge dictionaries", function() {
|
|
var expectedKeys = ["FontFile", "FontFile2", "FontFile3", "Size"];
|
|
|
|
var fontFileDict = new Dict();
|
|
fontFileDict.set("FontFile", "Type1 font file");
|
|
var mergedDict = Dict.merge(null, [
|
|
dictWithManyKeys,
|
|
dictWithSizeKey,
|
|
fontFileDict,
|
|
]);
|
|
var mergedKeys = mergedDict.getKeys();
|
|
|
|
expect(mergedKeys.sort()).toEqual(expectedKeys);
|
|
expect(mergedDict.get("FontFile")).toEqual(testFontFile);
|
|
});
|
|
});
|
|
|
|
describe("Ref", function() {
|
|
it("should retain the stored values", function() {
|
|
var storedNum = 4;
|
|
var storedGen = 2;
|
|
var ref = Ref.get(storedNum, storedGen);
|
|
expect(ref.num).toEqual(storedNum);
|
|
expect(ref.gen).toEqual(storedGen);
|
|
});
|
|
});
|
|
|
|
describe("RefSet", function() {
|
|
it("should have a stored value", function() {
|
|
var ref = Ref.get(4, 2);
|
|
var refset = new RefSet();
|
|
refset.put(ref);
|
|
expect(refset.has(ref)).toBeTruthy();
|
|
});
|
|
it("should not have an unknown value", function() {
|
|
var ref = Ref.get(4, 2);
|
|
var refset = new RefSet();
|
|
expect(refset.has(ref)).toBeFalsy();
|
|
|
|
refset.put(ref);
|
|
var anotherRef = Ref.get(2, 4);
|
|
expect(refset.has(anotherRef)).toBeFalsy();
|
|
});
|
|
});
|
|
|
|
describe("isName", function() {
|
|
it("handles non-names", function() {
|
|
var nonName = {};
|
|
expect(isName(nonName)).toEqual(false);
|
|
});
|
|
|
|
it("handles names", function() {
|
|
var name = Name.get("Font");
|
|
expect(isName(name)).toEqual(true);
|
|
});
|
|
|
|
it("handles names with name check", function() {
|
|
var name = Name.get("Font");
|
|
expect(isName(name, "Font")).toEqual(true);
|
|
expect(isName(name, "Subtype")).toEqual(false);
|
|
});
|
|
});
|
|
|
|
describe("isCmd", function() {
|
|
it("handles non-commands", function() {
|
|
var nonCmd = {};
|
|
expect(isCmd(nonCmd)).toEqual(false);
|
|
});
|
|
|
|
it("handles commands", function() {
|
|
var cmd = Cmd.get("BT");
|
|
expect(isCmd(cmd)).toEqual(true);
|
|
});
|
|
|
|
it("handles commands with cmd check", function() {
|
|
var cmd = Cmd.get("BT");
|
|
expect(isCmd(cmd, "BT")).toEqual(true);
|
|
expect(isCmd(cmd, "ET")).toEqual(false);
|
|
});
|
|
});
|
|
|
|
describe("isDict", function() {
|
|
it("handles non-dictionaries", function() {
|
|
var nonDict = {};
|
|
expect(isDict(nonDict)).toEqual(false);
|
|
});
|
|
|
|
it("handles empty dictionaries with type check", function() {
|
|
var dict = Dict.empty;
|
|
expect(isDict(dict)).toEqual(true);
|
|
expect(isDict(dict, "Page")).toEqual(false);
|
|
});
|
|
|
|
it("handles dictionaries with type check", function() {
|
|
var dict = new Dict();
|
|
dict.set("Type", Name.get("Page"));
|
|
expect(isDict(dict, "Page")).toEqual(true);
|
|
expect(isDict(dict, "Contents")).toEqual(false);
|
|
});
|
|
});
|
|
|
|
describe("isRef", function() {
|
|
it("handles non-refs", function() {
|
|
var nonRef = {};
|
|
expect(isRef(nonRef)).toEqual(false);
|
|
});
|
|
|
|
it("handles refs", function() {
|
|
var ref = Ref.get(1, 0);
|
|
expect(isRef(ref)).toEqual(true);
|
|
});
|
|
});
|
|
|
|
describe("isRefsEqual", function() {
|
|
it("should handle Refs pointing to the same object", function() {
|
|
var ref1 = Ref.get(1, 0);
|
|
var ref2 = Ref.get(1, 0);
|
|
expect(isRefsEqual(ref1, ref2)).toEqual(true);
|
|
});
|
|
|
|
it("should handle Refs pointing to different objects", function() {
|
|
var ref1 = Ref.get(1, 0);
|
|
var ref2 = Ref.get(2, 0);
|
|
expect(isRefsEqual(ref1, ref2)).toEqual(false);
|
|
});
|
|
});
|
|
});
|