From 0e1aa31bb9f98cb0fcc6f5ee3d2cc42632cd585f Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Wed, 11 Dec 2019 22:59:06 +0000 Subject: [PATCH] Bug 1602858 - Update pdf.js to version 2.4.176. r=bdahl Differential Revision: https://phabricator.services.mozilla.com/D56568 --HG-- extra : moz-landing-system : lando --- browser/extensions/pdfjs/README.mozilla | 4 +- browser/extensions/pdfjs/content/build/pdf.js | 126 +++--- .../pdfjs/content/build/pdf.worker.js | 370 +++++++++--------- .../extensions/pdfjs/content/web/viewer.js | 7 +- browser/extensions/pdfjs/moz.yaml | 2 +- 5 files changed, 238 insertions(+), 271 deletions(-) diff --git a/browser/extensions/pdfjs/README.mozilla b/browser/extensions/pdfjs/README.mozilla index 0df3b3fa1862..e40446377daf 100644 --- a/browser/extensions/pdfjs/README.mozilla +++ b/browser/extensions/pdfjs/README.mozilla @@ -1,5 +1,5 @@ This is the PDF.js project output, https://github.com/mozilla/pdf.js -Current extension version is: 2.4.163 +Current extension version is: 2.4.176 -Taken from upstream commit: 514b500a +Taken from upstream commit: af4ba75f diff --git a/browser/extensions/pdfjs/content/build/pdf.js b/browser/extensions/pdfjs/content/build/pdf.js index 72b6e76b4233..bb8ba8b7b141 100644 --- a/browser/extensions/pdfjs/content/build/pdf.js +++ b/browser/extensions/pdfjs/content/build/pdf.js @@ -123,24 +123,24 @@ return /******/ (function(modules) { // webpackBootstrap "use strict"; -var pdfjsVersion = '2.4.163'; -var pdfjsBuild = '514b500a'; +var pdfjsVersion = '2.4.176'; +var pdfjsBuild = 'af4ba75f'; var pdfjsSharedUtil = __w_pdfjs_require__(1); -var pdfjsDisplayAPI = __w_pdfjs_require__(5); +var pdfjsDisplayAPI = __w_pdfjs_require__(4); -var pdfjsDisplayTextLayer = __w_pdfjs_require__(17); +var pdfjsDisplayTextLayer = __w_pdfjs_require__(16); -var pdfjsDisplayAnnotationLayer = __w_pdfjs_require__(18); +var pdfjsDisplayAnnotationLayer = __w_pdfjs_require__(17); -var pdfjsDisplayDisplayUtils = __w_pdfjs_require__(6); +var pdfjsDisplayDisplayUtils = __w_pdfjs_require__(5); -var pdfjsDisplaySVG = __w_pdfjs_require__(19); +var pdfjsDisplaySVG = __w_pdfjs_require__(18); -let pdfjsDisplayWorkerOptions = __w_pdfjs_require__(11); +let pdfjsDisplayWorkerOptions = __w_pdfjs_require__(10); -let pdfjsDisplayAPICompatibility = __w_pdfjs_require__(8); +let pdfjsDisplayAPICompatibility = __w_pdfjs_require__(7); ; exports.build = pdfjsDisplayAPI.build; @@ -230,7 +230,7 @@ exports.createObjectURL = exports.FormatError = exports.Util = exports.UnknownEr __w_pdfjs_require__(2); -var _streams_polyfill = __w_pdfjs_require__(4); +var _streams_polyfill = __w_pdfjs_require__(3); const IDENTITY_MATRIX = [1, 0, 0, 1, 0, 0]; exports.IDENTITY_MATRIX = IDENTITY_MATRIX; @@ -1031,10 +1031,6 @@ exports.createObjectURL = createObjectURL; "use strict"; -const { - globalScope -} = __w_pdfjs_require__(3); - ; /***/ }), @@ -1044,20 +1040,6 @@ const { "use strict"; -Object.defineProperty(exports, "__esModule", { - value: true -}); -exports.globalScope = void 0; -const globalScope = typeof window !== 'undefined' && window.Math === Math ? window : typeof global !== 'undefined' && global.Math === Math ? global : typeof self !== 'undefined' && self.Math === Math ? self : {}; -exports.globalScope = globalScope; - -/***/ }), -/* 4 */ -/***/ (function(module, exports, __w_pdfjs_require__) { - -"use strict"; - - { if (typeof ReadableStream === 'undefined') { throw new Error('Please enable ReadableStream support by resetting the ' + '"javascript.options.streams" preference to "true" in about:config.'); @@ -1067,7 +1049,7 @@ exports.globalScope = globalScope; } /***/ }), -/* 5 */ +/* 4 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -1082,25 +1064,23 @@ exports.build = exports.version = exports.PDFPageProxy = exports.PDFDocumentProx var _util = __w_pdfjs_require__(1); -var _display_utils = __w_pdfjs_require__(6); +var _display_utils = __w_pdfjs_require__(5); -var _font_loader = __w_pdfjs_require__(7); +var _font_loader = __w_pdfjs_require__(6); -var _api_compatibility = __w_pdfjs_require__(8); +var _api_compatibility = __w_pdfjs_require__(7); -var _canvas = __w_pdfjs_require__(9); +var _canvas = __w_pdfjs_require__(8); -var _global_scope = __w_pdfjs_require__(3); +var _worker_options = __w_pdfjs_require__(10); -var _worker_options = __w_pdfjs_require__(11); +var _message_handler = __w_pdfjs_require__(11); -var _message_handler = __w_pdfjs_require__(12); +var _metadata = __w_pdfjs_require__(12); -var _metadata = __w_pdfjs_require__(13); +var _transport_stream = __w_pdfjs_require__(14); -var _transport_stream = __w_pdfjs_require__(15); - -var _webgl = __w_pdfjs_require__(16); +var _webgl = __w_pdfjs_require__(15); const DEFAULT_RANGE_CHUNK_SIZE = 65536; const RENDERING_CANCELLED_TIMEOUT = 100; @@ -1280,7 +1260,7 @@ function _fetchDocument(worker, source, pdfDataRangeTransport, docId) { return worker.messageHandler.sendWithPromise('GetDocRequest', { docId, - apiVersion: '2.4.163', + apiVersion: '2.4.176', source: { data: source.data, url: source.url, @@ -2125,13 +2105,13 @@ const PDFWorker = function PDFWorkerClosure() { } function getMainThreadWorkerMessageHandler() { + let mainWorkerMessageHandler; + try { - if (typeof window !== 'undefined') { - return window.pdfjsWorker && window.pdfjsWorker.WorkerMessageHandler; - } + mainWorkerMessageHandler = globalThis.pdfjsWorker && globalThis.pdfjsWorker.WorkerMessageHandler; } catch (ex) {} - return null; + return mainWorkerMessageHandler || null; } function setupFakeWorkerGlobal() { @@ -2633,10 +2613,10 @@ class WorkerTransport { let fontRegistry = null; - if (params.pdfBug && _global_scope.globalScope.FontInspector && _global_scope.globalScope.FontInspector.enabled) { + if (params.pdfBug && globalThis.FontInspector && globalThis.FontInspector.enabled) { fontRegistry = { registerFont(font, url) { - _global_scope.globalScope['FontInspector'].fontAdded(font, url); + globalThis.FontInspector.fontAdded(font, url); } }; @@ -3100,8 +3080,8 @@ const InternalRenderTask = function InternalRenderTaskClosure() { canvasInRendering.add(this._canvas); } - if (this._pdfBug && _global_scope.globalScope.StepperManager && _global_scope.globalScope.StepperManager.enabled) { - this.stepper = _global_scope.globalScope.StepperManager.create(this.pageNumber - 1); + if (this._pdfBug && globalThis.StepperManager && globalThis.StepperManager.enabled) { + this.stepper = globalThis.StepperManager.create(this.pageNumber - 1); this.stepper.init(this.operatorList); this.stepper.nextBreakPoint = this.stepper.getNextBreakPoint(); } @@ -3214,13 +3194,13 @@ const InternalRenderTask = function InternalRenderTaskClosure() { return InternalRenderTask; }(); -const version = '2.4.163'; +const version = '2.4.176'; exports.version = version; -const build = '514b500a'; +const build = 'af4ba75f'; exports.build = build; /***/ }), -/* 6 */ +/* 5 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -3687,7 +3667,7 @@ class PDFDateString { exports.PDFDateString = PDFDateString; /***/ }), -/* 7 */ +/* 6 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -3948,7 +3928,7 @@ class FontFaceObject { exports.FontFaceObject = FontFaceObject; /***/ }), -/* 8 */ +/* 7 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -3959,7 +3939,7 @@ let compatibilityParams = Object.create(null); exports.apiCompatibilityParams = Object.freeze(compatibilityParams); /***/ }), -/* 9 */ +/* 8 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -3972,7 +3952,7 @@ exports.CanvasGraphics = void 0; var _util = __w_pdfjs_require__(1); -var _pattern_helper = __w_pdfjs_require__(10); +var _pattern_helper = __w_pdfjs_require__(9); var MIN_FONT_SIZE = 16; var MAX_FONT_SIZE = 100; @@ -6017,7 +5997,7 @@ var CanvasGraphics = function CanvasGraphicsClosure() { exports.CanvasGraphics = CanvasGraphics; /***/ }), -/* 10 */ +/* 9 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -6466,7 +6446,7 @@ var TilingPattern = function TilingPatternClosure() { exports.TilingPattern = TilingPattern; /***/ }), -/* 11 */ +/* 10 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -6482,7 +6462,7 @@ GlobalWorkerOptions.workerPort = GlobalWorkerOptions.workerPort === undefined ? GlobalWorkerOptions.workerSrc = GlobalWorkerOptions.workerSrc === undefined ? '' : GlobalWorkerOptions.workerSrc; /***/ }), -/* 12 */ +/* 11 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -6983,7 +6963,7 @@ class MessageHandler { exports.MessageHandler = MessageHandler; /***/ }), -/* 13 */ +/* 12 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -6996,7 +6976,7 @@ exports.Metadata = void 0; var _util = __w_pdfjs_require__(1); -var _xml_parser = __w_pdfjs_require__(14); +var _xml_parser = __w_pdfjs_require__(13); class Metadata { constructor(data) { @@ -7105,7 +7085,7 @@ class Metadata { exports.Metadata = Metadata; /***/ }), -/* 14 */ +/* 13 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -7551,7 +7531,7 @@ class SimpleXMLParser extends XMLParserBase { exports.SimpleXMLParser = SimpleXMLParser; /***/ }), -/* 15 */ +/* 14 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -7906,7 +7886,7 @@ class PDFDataTransportStreamRangeReader { } /***/ }), -/* 16 */ +/* 15 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -8353,7 +8333,7 @@ var WebGLUtils = function WebGLUtilsClosure() { }(); /***/ }), -/* 17 */ +/* 16 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -8366,8 +8346,6 @@ exports.renderTextLayer = void 0; var _util = __w_pdfjs_require__(1); -var _global_scope = __w_pdfjs_require__(3); - var renderTextLayer = function renderTextLayerClosure() { var MAX_TEXT_DIVS_TO_RENDER = 100000; var NonWhitespaceRegexp = /\S/; @@ -8794,7 +8772,7 @@ var renderTextLayer = function renderTextLayerClosure() { this._textDivs = textDivs || []; this._textContentItemsStr = textContentItemsStr || []; this._enhanceTextSelection = !!enhanceTextSelection; - this._fontInspectorEnabled = !!(_global_scope.globalScope.FontInspector && _global_scope.globalScope.FontInspector.enabled); + this._fontInspectorEnabled = !!(globalThis.FontInspector && globalThis.FontInspector.enabled); this._reader = null; this._layoutTextLastFontSize = null; this._layoutTextLastFontFamily = null; @@ -9043,7 +9021,7 @@ var renderTextLayer = function renderTextLayerClosure() { exports.renderTextLayer = renderTextLayer; /***/ }), -/* 18 */ +/* 17 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -9054,7 +9032,7 @@ Object.defineProperty(exports, "__esModule", { }); exports.AnnotationLayer = void 0; -var _display_utils = __w_pdfjs_require__(6); +var _display_utils = __w_pdfjs_require__(5); var _util = __w_pdfjs_require__(1); @@ -10052,7 +10030,7 @@ class AnnotationLayer { exports.AnnotationLayer = AnnotationLayer; /***/ }), -/* 19 */ +/* 18 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -10065,9 +10043,9 @@ exports.SVGGraphics = void 0; var _util = __w_pdfjs_require__(1); -var _display_utils = __w_pdfjs_require__(6); +var _display_utils = __w_pdfjs_require__(5); -var _is_node = __w_pdfjs_require__(20); +var _is_node = __w_pdfjs_require__(19); let SVGGraphics = function () { throw new Error('Not implemented: SVGGraphics'); @@ -10077,7 +10055,7 @@ exports.SVGGraphics = SVGGraphics; ; /***/ }), -/* 20 */ +/* 19 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; diff --git a/browser/extensions/pdfjs/content/build/pdf.worker.js b/browser/extensions/pdfjs/content/build/pdf.worker.js index b0f18590d37f..c4eefc93563d 100644 --- a/browser/extensions/pdfjs/content/build/pdf.worker.js +++ b/browser/extensions/pdfjs/content/build/pdf.worker.js @@ -123,8 +123,8 @@ return /******/ (function(modules) { // webpackBootstrap "use strict"; -const pdfjsVersion = '2.4.163'; -const pdfjsBuild = '514b500a'; +const pdfjsVersion = '2.4.176'; +const pdfjsBuild = 'af4ba75f'; const pdfjsCoreWorker = __w_pdfjs_require__(1); @@ -144,17 +144,17 @@ exports.WorkerMessageHandler = exports.WorkerTask = void 0; var _util = __w_pdfjs_require__(2); -var _primitives = __w_pdfjs_require__(6); +var _primitives = __w_pdfjs_require__(5); -var _pdf_manager = __w_pdfjs_require__(7); +var _pdf_manager = __w_pdfjs_require__(6); -var _is_node = __w_pdfjs_require__(46); +var _is_node = __w_pdfjs_require__(45); -var _message_handler = __w_pdfjs_require__(47); +var _message_handler = __w_pdfjs_require__(46); -var _worker_stream = __w_pdfjs_require__(48); +var _worker_stream = __w_pdfjs_require__(47); -var _core_utils = __w_pdfjs_require__(9); +var _core_utils = __w_pdfjs_require__(8); var WorkerTask = function WorkerTaskClosure() { function WorkerTask(name) { @@ -223,7 +223,7 @@ var WorkerMessageHandler = { var WorkerTasks = []; const verbosity = (0, _util.getVerbosityLevel)(); const apiVersion = docParams.apiVersion; - const workerVersion = '2.4.163'; + const workerVersion = '2.4.176'; if (apiVersion !== workerVersion) { throw new Error(`The API version "${apiVersion}" does not match ` + `the Worker version "${workerVersion}".`); @@ -705,7 +705,7 @@ exports.createObjectURL = exports.FormatError = exports.Util = exports.UnknownEr __w_pdfjs_require__(3); -var _streams_polyfill = __w_pdfjs_require__(5); +var _streams_polyfill = __w_pdfjs_require__(4); const IDENTITY_MATRIX = [1, 0, 0, 1, 0, 0]; exports.IDENTITY_MATRIX = IDENTITY_MATRIX; @@ -1506,10 +1506,6 @@ exports.createObjectURL = createObjectURL; "use strict"; -const { - globalScope -} = __w_pdfjs_require__(4); - ; /***/ }), @@ -1519,20 +1515,6 @@ const { "use strict"; -Object.defineProperty(exports, "__esModule", { - value: true -}); -exports.globalScope = void 0; -const globalScope = typeof window !== 'undefined' && window.Math === Math ? window : typeof global !== 'undefined' && global.Math === Math ? global : typeof self !== 'undefined' && self.Math === Math ? self : {}; -exports.globalScope = globalScope; - -/***/ }), -/* 5 */ -/***/ (function(module, exports, __w_pdfjs_require__) { - -"use strict"; - - { if (typeof ReadableStream === 'undefined') { throw new Error('Please enable ReadableStream support by resetting the ' + '"javascript.options.streams" preference to "true" in about:config.'); @@ -1542,7 +1524,7 @@ exports.globalScope = globalScope; } /***/ }), -/* 6 */ +/* 5 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -1856,7 +1838,7 @@ function clearPrimitiveCaches() { } /***/ }), -/* 7 */ +/* 6 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -1869,13 +1851,13 @@ exports.NetworkPdfManager = exports.LocalPdfManager = void 0; var _util = __w_pdfjs_require__(2); -var _chunked_stream = __w_pdfjs_require__(8); +var _chunked_stream = __w_pdfjs_require__(7); -var _core_utils = __w_pdfjs_require__(9); +var _core_utils = __w_pdfjs_require__(8); -var _document = __w_pdfjs_require__(10); +var _document = __w_pdfjs_require__(9); -var _stream = __w_pdfjs_require__(13); +var _stream = __w_pdfjs_require__(12); class BasePdfManager { constructor() { @@ -2063,7 +2045,7 @@ class NetworkPdfManager extends BasePdfManager { exports.NetworkPdfManager = NetworkPdfManager; /***/ }), -/* 8 */ +/* 7 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -2076,7 +2058,7 @@ exports.ChunkedStreamManager = exports.ChunkedStream = void 0; var _util = __w_pdfjs_require__(2); -var _core_utils = __w_pdfjs_require__(9); +var _core_utils = __w_pdfjs_require__(8); class ChunkedStream { constructor(length, chunkSize, manager) { @@ -2676,7 +2658,7 @@ class ChunkedStreamManager { exports.ChunkedStreamManager = ChunkedStreamManager; /***/ }), -/* 9 */ +/* 8 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -2784,7 +2766,7 @@ function toRomanNumerals(number, lowerCase = false) { } /***/ }), -/* 10 */ +/* 9 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -2797,25 +2779,25 @@ exports.PDFDocument = exports.Page = void 0; var _util = __w_pdfjs_require__(2); -var _obj = __w_pdfjs_require__(11); +var _obj = __w_pdfjs_require__(10); -var _primitives = __w_pdfjs_require__(6); +var _primitives = __w_pdfjs_require__(5); -var _core_utils = __w_pdfjs_require__(9); +var _core_utils = __w_pdfjs_require__(8); -var _stream = __w_pdfjs_require__(13); +var _stream = __w_pdfjs_require__(12); -var _annotation = __w_pdfjs_require__(25); +var _annotation = __w_pdfjs_require__(24); -var _crypto = __w_pdfjs_require__(23); +var _crypto = __w_pdfjs_require__(22); -var _parser = __w_pdfjs_require__(12); +var _parser = __w_pdfjs_require__(11); -var _operator_list = __w_pdfjs_require__(26); +var _operator_list = __w_pdfjs_require__(25); -var _evaluator = __w_pdfjs_require__(27); +var _evaluator = __w_pdfjs_require__(26); -var _function = __w_pdfjs_require__(41); +var _function = __w_pdfjs_require__(40); const DEFAULT_USER_UNIT = 1.0; const LETTER_SIZE_MEDIABOX = [0, 0, 612, 792]; @@ -3159,7 +3141,7 @@ class PDFDocument { } if (stream.length <= 0) { - throw new Error('PDFDocument: Stream must have data'); + throw new _util.InvalidPDFException('The PDF file is empty, i.e. its size is zero bytes.'); } this.pdfManager = pdfManager; @@ -3460,10 +3442,10 @@ class PDFDocument { } checkFirstPage() { - return this.getPage(0).catch(reason => { + return this.getPage(0).catch(async reason => { if (reason instanceof _core_utils.XRefEntryException) { this._pagePromises.length = 0; - this.cleanup(); + await this.cleanup(); throw new _core_utils.XRefParseException(); } }); @@ -3482,7 +3464,7 @@ class PDFDocument { exports.PDFDocument = PDFDocument; /***/ }), -/* 11 */ +/* 10 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -3495,15 +3477,15 @@ exports.FileSpec = exports.XRef = exports.ObjectLoader = exports.Catalog = void var _util = __w_pdfjs_require__(2); -var _primitives = __w_pdfjs_require__(6); +var _primitives = __w_pdfjs_require__(5); -var _parser = __w_pdfjs_require__(12); +var _parser = __w_pdfjs_require__(11); -var _core_utils = __w_pdfjs_require__(9); +var _core_utils = __w_pdfjs_require__(8); -var _crypto = __w_pdfjs_require__(23); +var _crypto = __w_pdfjs_require__(22); -var _colorspace = __w_pdfjs_require__(24); +var _colorspace = __w_pdfjs_require__(23); function fetchDestination(dest) { return (0, _primitives.isDict)(dest) ? dest.get('D') : dest; @@ -4216,9 +4198,10 @@ class Catalog { promises.push(promise); }); return Promise.all(promises).then(translatedFonts => { - for (let i = 0, ii = translatedFonts.length; i < ii; i++) { - const font = translatedFonts[i].dict; - delete font.translated; + for (const { + dict + } of translatedFonts) { + delete dict.translated; } this.fontCache.clear(); @@ -5047,7 +5030,7 @@ var XRef = function XRefClosure() { return trailerDict; } - throw new _util.InvalidPDFException('Invalid PDF structure'); + throw new _util.InvalidPDFException('Invalid PDF structure.'); }, readXRef: function XRef_readXRef(recoveryMode) { var stream = this.stream; @@ -5720,7 +5703,7 @@ let ObjectLoader = function () { exports.ObjectLoader = ObjectLoader; /***/ }), -/* 12 */ +/* 11 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -5731,21 +5714,21 @@ Object.defineProperty(exports, "__esModule", { }); exports.Parser = exports.Linearization = exports.Lexer = void 0; -var _stream = __w_pdfjs_require__(13); +var _stream = __w_pdfjs_require__(12); var _util = __w_pdfjs_require__(2); -var _primitives = __w_pdfjs_require__(6); +var _primitives = __w_pdfjs_require__(5); -var _ccitt_stream = __w_pdfjs_require__(14); +var _ccitt_stream = __w_pdfjs_require__(13); -var _jbig2_stream = __w_pdfjs_require__(16); +var _jbig2_stream = __w_pdfjs_require__(15); -var _jpeg_stream = __w_pdfjs_require__(19); +var _jpeg_stream = __w_pdfjs_require__(18); -var _jpx_stream = __w_pdfjs_require__(21); +var _jpx_stream = __w_pdfjs_require__(20); -var _core_utils = __w_pdfjs_require__(9); +var _core_utils = __w_pdfjs_require__(8); const MAX_LENGTH_TO_CACHE = 1000; const MAX_ADLER32_LENGTH = 5552; @@ -6063,6 +6046,7 @@ class Parser { while ((ch = stream.getByte()) !== -1) { if (ch === TILDE) { + const tildePos = stream.pos; ch = stream.peekByte(); while ((0, _util.isSpace)(ch)) { @@ -6074,6 +6058,14 @@ class Parser { stream.skip(); break; } + + if (stream.pos > tildePos) { + const maybeEI = stream.peekBytes(2); + + if (maybeEI[0] === 0x45 && maybeEI[1] === 0x49) { + break; + } + } } } @@ -7002,7 +6994,7 @@ class Linearization { exports.Linearization = Linearization; /***/ }), -/* 13 */ +/* 12 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -7015,7 +7007,7 @@ exports.LZWStream = exports.StringStream = exports.StreamsSequenceStream = expor var _util = __w_pdfjs_require__(2); -var _primitives = __w_pdfjs_require__(6); +var _primitives = __w_pdfjs_require__(5); var Stream = function StreamClosure() { function Stream(arrayBuffer, start, length, dict) { @@ -8302,7 +8294,7 @@ var NullStream = function NullStreamClosure() { exports.NullStream = NullStream; /***/ }), -/* 14 */ +/* 13 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -8313,11 +8305,11 @@ Object.defineProperty(exports, "__esModule", { }); exports.CCITTFaxStream = void 0; -var _primitives = __w_pdfjs_require__(6); +var _primitives = __w_pdfjs_require__(5); -var _ccitt = __w_pdfjs_require__(15); +var _ccitt = __w_pdfjs_require__(14); -var _stream = __w_pdfjs_require__(13); +var _stream = __w_pdfjs_require__(12); var CCITTFaxStream = function CCITTFaxStreamClosure() { function CCITTFaxStream(str, maybeLength, params) { @@ -8369,7 +8361,7 @@ var CCITTFaxStream = function CCITTFaxStreamClosure() { exports.CCITTFaxStream = CCITTFaxStream; /***/ }), -/* 15 */ +/* 14 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -9074,7 +9066,7 @@ let CCITTFaxDecoder = function CCITTFaxDecoder() { exports.CCITTFaxDecoder = CCITTFaxDecoder; /***/ }), -/* 16 */ +/* 15 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -9085,11 +9077,11 @@ Object.defineProperty(exports, "__esModule", { }); exports.Jbig2Stream = void 0; -var _primitives = __w_pdfjs_require__(6); +var _primitives = __w_pdfjs_require__(5); -var _stream = __w_pdfjs_require__(13); +var _stream = __w_pdfjs_require__(12); -var _jbig = __w_pdfjs_require__(17); +var _jbig = __w_pdfjs_require__(16); var _util = __w_pdfjs_require__(2); @@ -9158,7 +9150,7 @@ let Jbig2Stream = function Jbig2StreamClosure() { exports.Jbig2Stream = Jbig2Stream; /***/ }), -/* 17 */ +/* 16 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -9171,9 +9163,9 @@ exports.Jbig2Image = void 0; var _util = __w_pdfjs_require__(2); -var _arithmetic_decoder = __w_pdfjs_require__(18); +var _arithmetic_decoder = __w_pdfjs_require__(17); -var _ccitt = __w_pdfjs_require__(15); +var _ccitt = __w_pdfjs_require__(14); class Jbig2Error extends _util.BaseException { constructor(msg) { @@ -11367,7 +11359,7 @@ var Jbig2Image = function Jbig2ImageClosure() { exports.Jbig2Image = Jbig2Image; /***/ }), -/* 18 */ +/* 17 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -11721,7 +11713,7 @@ class ArithmeticDecoder { exports.ArithmeticDecoder = ArithmeticDecoder; /***/ }), -/* 19 */ +/* 18 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -11734,11 +11726,11 @@ exports.JpegStream = void 0; var _util = __w_pdfjs_require__(2); -var _stream = __w_pdfjs_require__(13); +var _stream = __w_pdfjs_require__(12); -var _primitives = __w_pdfjs_require__(6); +var _primitives = __w_pdfjs_require__(5); -var _jpg = __w_pdfjs_require__(20); +var _jpg = __w_pdfjs_require__(19); let JpegStream = function JpegStreamClosure() { function JpegStream(stream, maybeLength, dict, params) { @@ -11832,7 +11824,7 @@ let JpegStream = function JpegStreamClosure() { exports.JpegStream = JpegStream; /***/ }), -/* 20 */ +/* 19 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -13002,7 +12994,7 @@ var JpegImage = function JpegImageClosure() { exports.JpegImage = JpegImage; /***/ }), -/* 21 */ +/* 20 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -13013,9 +13005,9 @@ Object.defineProperty(exports, "__esModule", { }); exports.JpxStream = void 0; -var _stream = __w_pdfjs_require__(13); +var _stream = __w_pdfjs_require__(12); -var _jpx = __w_pdfjs_require__(22); +var _jpx = __w_pdfjs_require__(21); var _util = __w_pdfjs_require__(2); @@ -13089,7 +13081,7 @@ let JpxStream = function JpxStreamClosure() { exports.JpxStream = JpxStream; /***/ }), -/* 22 */ +/* 21 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -13102,7 +13094,7 @@ exports.JpxImage = void 0; var _util = __w_pdfjs_require__(2); -var _arithmetic_decoder = __w_pdfjs_require__(18); +var _arithmetic_decoder = __w_pdfjs_require__(17); class JpxError extends _util.BaseException { constructor(msg) { @@ -15403,7 +15395,7 @@ var JpxImage = function JpxImageClosure() { exports.JpxImage = JpxImage; /***/ }), -/* 23 */ +/* 22 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -15416,9 +15408,9 @@ exports.calculateSHA512 = exports.calculateSHA384 = exports.calculateSHA256 = ex var _util = __w_pdfjs_require__(2); -var _primitives = __w_pdfjs_require__(6); +var _primitives = __w_pdfjs_require__(5); -var _stream = __w_pdfjs_require__(13); +var _stream = __w_pdfjs_require__(12); var ARCFourCipher = function ARCFourCipherClosure() { function ARCFourCipher(key) { @@ -16993,7 +16985,7 @@ var CipherTransformFactory = function CipherTransformFactoryClosure() { exports.CipherTransformFactory = CipherTransformFactory; /***/ }), -/* 24 */ +/* 23 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -17006,7 +16998,7 @@ exports.ColorSpace = void 0; var _util = __w_pdfjs_require__(2); -var _primitives = __w_pdfjs_require__(6); +var _primitives = __w_pdfjs_require__(5); function resizeRgbImage(src, dest, w1, h1, w2, h2, alpha01) { const COMPONENTS = 3; @@ -18029,7 +18021,7 @@ const LabCS = function LabCSClosure() { }(); /***/ }), -/* 25 */ +/* 24 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -18043,17 +18035,17 @@ exports.MarkupAnnotation = exports.AnnotationFactory = exports.AnnotationBorderS var _util = __w_pdfjs_require__(2); -var _obj = __w_pdfjs_require__(11); +var _obj = __w_pdfjs_require__(10); -var _primitives = __w_pdfjs_require__(6); +var _primitives = __w_pdfjs_require__(5); -var _colorspace = __w_pdfjs_require__(24); +var _colorspace = __w_pdfjs_require__(23); -var _core_utils = __w_pdfjs_require__(9); +var _core_utils = __w_pdfjs_require__(8); -var _operator_list = __w_pdfjs_require__(26); +var _operator_list = __w_pdfjs_require__(25); -var _stream = __w_pdfjs_require__(13); +var _stream = __w_pdfjs_require__(12); class AnnotationFactory { static create(xref, ref, pdfManager, idFactory) { @@ -19112,7 +19104,7 @@ class FileAttachmentAnnotation extends MarkupAnnotation { } /***/ }), -/* 26 */ +/* 25 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -19769,7 +19761,7 @@ var OperatorList = function OperatorListClosure() { exports.OperatorList = OperatorList; /***/ }), -/* 27 */ +/* 26 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -19782,45 +19774,45 @@ exports.PartialEvaluator = void 0; var _util = __w_pdfjs_require__(2); -var _cmap = __w_pdfjs_require__(28); +var _cmap = __w_pdfjs_require__(27); -var _primitives = __w_pdfjs_require__(6); +var _primitives = __w_pdfjs_require__(5); -var _fonts = __w_pdfjs_require__(29); +var _fonts = __w_pdfjs_require__(28); -var _encodings = __w_pdfjs_require__(32); +var _encodings = __w_pdfjs_require__(31); -var _unicode = __w_pdfjs_require__(35); +var _unicode = __w_pdfjs_require__(34); -var _standard_fonts = __w_pdfjs_require__(34); +var _standard_fonts = __w_pdfjs_require__(33); -var _pattern = __w_pdfjs_require__(38); +var _pattern = __w_pdfjs_require__(37); -var _parser = __w_pdfjs_require__(12); +var _parser = __w_pdfjs_require__(11); -var _bidi = __w_pdfjs_require__(39); +var _bidi = __w_pdfjs_require__(38); -var _colorspace = __w_pdfjs_require__(24); +var _colorspace = __w_pdfjs_require__(23); -var _stream = __w_pdfjs_require__(13); +var _stream = __w_pdfjs_require__(12); -var _glyphlist = __w_pdfjs_require__(33); +var _glyphlist = __w_pdfjs_require__(32); -var _core_utils = __w_pdfjs_require__(9); +var _core_utils = __w_pdfjs_require__(8); -var _metrics = __w_pdfjs_require__(40); +var _metrics = __w_pdfjs_require__(39); -var _function = __w_pdfjs_require__(41); +var _function = __w_pdfjs_require__(40); -var _jpeg_stream = __w_pdfjs_require__(19); +var _jpeg_stream = __w_pdfjs_require__(18); -var _murmurhash = __w_pdfjs_require__(43); +var _murmurhash = __w_pdfjs_require__(42); -var _image_utils = __w_pdfjs_require__(44); +var _image_utils = __w_pdfjs_require__(43); -var _operator_list = __w_pdfjs_require__(26); +var _operator_list = __w_pdfjs_require__(25); -var _image = __w_pdfjs_require__(45); +var _image = __w_pdfjs_require__(44); var PartialEvaluator = function PartialEvaluatorClosure() { const DefaultPartialEvaluatorOptions = { @@ -23198,7 +23190,7 @@ var EvaluatorPreprocessor = function EvaluatorPreprocessorClosure() { }(); /***/ }), -/* 28 */ +/* 27 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -23211,13 +23203,13 @@ exports.CMapFactory = exports.IdentityCMap = exports.CMap = void 0; var _util = __w_pdfjs_require__(2); -var _primitives = __w_pdfjs_require__(6); +var _primitives = __w_pdfjs_require__(5); -var _parser = __w_pdfjs_require__(12); +var _parser = __w_pdfjs_require__(11); -var _core_utils = __w_pdfjs_require__(9); +var _core_utils = __w_pdfjs_require__(8); -var _stream = __w_pdfjs_require__(13); +var _stream = __w_pdfjs_require__(12); var BUILT_IN_CMAPS = ['Adobe-GB1-UCS2', 'Adobe-CNS1-UCS2', 'Adobe-Japan1-UCS2', 'Adobe-Korea1-UCS2', '78-EUC-H', '78-EUC-V', '78-H', '78-RKSJ-H', '78-RKSJ-V', '78-V', '78ms-RKSJ-H', '78ms-RKSJ-V', '83pv-RKSJ-H', '90ms-RKSJ-H', '90ms-RKSJ-V', '90msp-RKSJ-H', '90msp-RKSJ-V', '90pv-RKSJ-H', '90pv-RKSJ-V', 'Add-H', 'Add-RKSJ-H', 'Add-RKSJ-V', 'Add-V', 'Adobe-CNS1-0', 'Adobe-CNS1-1', 'Adobe-CNS1-2', 'Adobe-CNS1-3', 'Adobe-CNS1-4', 'Adobe-CNS1-5', 'Adobe-CNS1-6', 'Adobe-GB1-0', 'Adobe-GB1-1', 'Adobe-GB1-2', 'Adobe-GB1-3', 'Adobe-GB1-4', 'Adobe-GB1-5', 'Adobe-Japan1-0', 'Adobe-Japan1-1', 'Adobe-Japan1-2', 'Adobe-Japan1-3', 'Adobe-Japan1-4', 'Adobe-Japan1-5', 'Adobe-Japan1-6', 'Adobe-Korea1-0', 'Adobe-Korea1-1', 'Adobe-Korea1-2', 'B5-H', 'B5-V', 'B5pc-H', 'B5pc-V', 'CNS-EUC-H', 'CNS-EUC-V', 'CNS1-H', 'CNS1-V', 'CNS2-H', 'CNS2-V', 'ETHK-B5-H', 'ETHK-B5-V', 'ETen-B5-H', 'ETen-B5-V', 'ETenms-B5-H', 'ETenms-B5-V', 'EUC-H', 'EUC-V', 'Ext-H', 'Ext-RKSJ-H', 'Ext-RKSJ-V', 'Ext-V', 'GB-EUC-H', 'GB-EUC-V', 'GB-H', 'GB-V', 'GBK-EUC-H', 'GBK-EUC-V', 'GBK2K-H', 'GBK2K-V', 'GBKp-EUC-H', 'GBKp-EUC-V', 'GBT-EUC-H', 'GBT-EUC-V', 'GBT-H', 'GBT-V', 'GBTpc-EUC-H', 'GBTpc-EUC-V', 'GBpc-EUC-H', 'GBpc-EUC-V', 'H', 'HKdla-B5-H', 'HKdla-B5-V', 'HKdlb-B5-H', 'HKdlb-B5-V', 'HKgccs-B5-H', 'HKgccs-B5-V', 'HKm314-B5-H', 'HKm314-B5-V', 'HKm471-B5-H', 'HKm471-B5-V', 'HKscs-B5-H', 'HKscs-B5-V', 'Hankaku', 'Hiragana', 'KSC-EUC-H', 'KSC-EUC-V', 'KSC-H', 'KSC-Johab-H', 'KSC-Johab-V', 'KSC-V', 'KSCms-UHC-H', 'KSCms-UHC-HW-H', 'KSCms-UHC-HW-V', 'KSCms-UHC-V', 'KSCpc-EUC-H', 'KSCpc-EUC-V', 'Katakana', 'NWP-H', 'NWP-V', 'RKSJ-H', 'RKSJ-V', 'Roman', 'UniCNS-UCS2-H', 'UniCNS-UCS2-V', 'UniCNS-UTF16-H', 'UniCNS-UTF16-V', 'UniCNS-UTF32-H', 'UniCNS-UTF32-V', 'UniCNS-UTF8-H', 'UniCNS-UTF8-V', 'UniGB-UCS2-H', 'UniGB-UCS2-V', 'UniGB-UTF16-H', 'UniGB-UTF16-V', 'UniGB-UTF32-H', 'UniGB-UTF32-V', 'UniGB-UTF8-H', 'UniGB-UTF8-V', 'UniJIS-UCS2-H', 'UniJIS-UCS2-HW-H', 'UniJIS-UCS2-HW-V', 'UniJIS-UCS2-V', 'UniJIS-UTF16-H', 'UniJIS-UTF16-V', 'UniJIS-UTF32-H', 'UniJIS-UTF32-V', 'UniJIS-UTF8-H', 'UniJIS-UTF8-V', 'UniJIS2004-UTF16-H', 'UniJIS2004-UTF16-V', 'UniJIS2004-UTF32-H', 'UniJIS2004-UTF32-V', 'UniJIS2004-UTF8-H', 'UniJIS2004-UTF8-V', 'UniJISPro-UCS2-HW-V', 'UniJISPro-UCS2-V', 'UniJISPro-UTF8-V', 'UniJISX0213-UTF32-H', 'UniJISX0213-UTF32-V', 'UniJISX02132004-UTF32-H', 'UniJISX02132004-UTF32-V', 'UniKS-UCS2-H', 'UniKS-UCS2-V', 'UniKS-UTF16-H', 'UniKS-UTF16-V', 'UniKS-UTF32-H', 'UniKS-UTF32-V', 'UniKS-UTF8-H', 'UniKS-UTF8-V', 'V', 'WP-Symbol']; @@ -24095,7 +24087,7 @@ var CMapFactory = function CMapFactoryClosure() { exports.CMapFactory = CMapFactory; /***/ }), -/* 29 */ +/* 28 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -24109,25 +24101,25 @@ exports.IdentityToUnicodeMap = exports.ToUnicodeMap = exports.FontFlags = export var _util = __w_pdfjs_require__(2); -var _cff_parser = __w_pdfjs_require__(30); +var _cff_parser = __w_pdfjs_require__(29); -var _glyphlist = __w_pdfjs_require__(33); +var _glyphlist = __w_pdfjs_require__(32); -var _encodings = __w_pdfjs_require__(32); +var _encodings = __w_pdfjs_require__(31); -var _standard_fonts = __w_pdfjs_require__(34); +var _standard_fonts = __w_pdfjs_require__(33); -var _unicode = __w_pdfjs_require__(35); +var _unicode = __w_pdfjs_require__(34); -var _font_renderer = __w_pdfjs_require__(36); +var _font_renderer = __w_pdfjs_require__(35); -var _cmap = __w_pdfjs_require__(28); +var _cmap = __w_pdfjs_require__(27); -var _core_utils = __w_pdfjs_require__(9); +var _core_utils = __w_pdfjs_require__(8); -var _stream = __w_pdfjs_require__(13); +var _stream = __w_pdfjs_require__(12); -var _type1_parser = __w_pdfjs_require__(37); +var _type1_parser = __w_pdfjs_require__(36); const PRIVATE_USE_AREAS = [[0xE000, 0xF8FF], [0x100000, 0x10FFFD]]; var PDF_GLYPH_SPACE_UNITS = 1000; @@ -27276,7 +27268,7 @@ var CFFFont = function CFFFontClosure() { }(); /***/ }), -/* 30 */ +/* 29 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -27289,9 +27281,9 @@ exports.CFFFDSelect = exports.CFFCompiler = exports.CFFPrivateDict = exports.CFF var _util = __w_pdfjs_require__(2); -var _charsets = __w_pdfjs_require__(31); +var _charsets = __w_pdfjs_require__(30); -var _encodings = __w_pdfjs_require__(32); +var _encodings = __w_pdfjs_require__(31); var MAX_SUBR_NESTING = 10; var CFFStandardStrings = ['.notdef', 'space', 'exclam', 'quotedbl', 'numbersign', 'dollar', 'percent', 'ampersand', 'quoteright', 'parenleft', 'parenright', 'asterisk', 'plus', 'comma', 'hyphen', 'period', 'slash', 'zero', 'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine', 'colon', 'semicolon', 'less', 'equal', 'greater', 'question', 'at', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'bracketleft', 'backslash', 'bracketright', 'asciicircum', 'underscore', 'quoteleft', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 'braceleft', 'bar', 'braceright', 'asciitilde', 'exclamdown', 'cent', 'sterling', 'fraction', 'yen', 'florin', 'section', 'currency', 'quotesingle', 'quotedblleft', 'guillemotleft', 'guilsinglleft', 'guilsinglright', 'fi', 'fl', 'endash', 'dagger', 'daggerdbl', 'periodcentered', 'paragraph', 'bullet', 'quotesinglbase', 'quotedblbase', 'quotedblright', 'guillemotright', 'ellipsis', 'perthousand', 'questiondown', 'grave', 'acute', 'circumflex', 'tilde', 'macron', 'breve', 'dotaccent', 'dieresis', 'ring', 'cedilla', 'hungarumlaut', 'ogonek', 'caron', 'emdash', 'AE', 'ordfeminine', 'Lslash', 'Oslash', 'OE', 'ordmasculine', 'ae', 'dotlessi', 'lslash', 'oslash', 'oe', 'germandbls', 'onesuperior', 'logicalnot', 'mu', 'trademark', 'Eth', 'onehalf', 'plusminus', 'Thorn', 'onequarter', 'divide', 'brokenbar', 'degree', 'thorn', 'threequarters', 'twosuperior', 'registered', 'minus', 'eth', 'multiply', 'threesuperior', 'copyright', 'Aacute', 'Acircumflex', 'Adieresis', 'Agrave', 'Aring', 'Atilde', 'Ccedilla', 'Eacute', 'Ecircumflex', 'Edieresis', 'Egrave', 'Iacute', 'Icircumflex', 'Idieresis', 'Igrave', 'Ntilde', 'Oacute', 'Ocircumflex', 'Odieresis', 'Ograve', 'Otilde', 'Scaron', 'Uacute', 'Ucircumflex', 'Udieresis', 'Ugrave', 'Yacute', 'Ydieresis', 'Zcaron', 'aacute', 'acircumflex', 'adieresis', 'agrave', 'aring', 'atilde', 'ccedilla', 'eacute', 'ecircumflex', 'edieresis', 'egrave', 'iacute', 'icircumflex', 'idieresis', 'igrave', 'ntilde', 'oacute', 'ocircumflex', 'odieresis', 'ograve', 'otilde', 'scaron', 'uacute', 'ucircumflex', 'udieresis', 'ugrave', 'yacute', 'ydieresis', 'zcaron', 'exclamsmall', 'Hungarumlautsmall', 'dollaroldstyle', 'dollarsuperior', 'ampersandsmall', 'Acutesmall', 'parenleftsuperior', 'parenrightsuperior', 'twodotenleader', 'onedotenleader', 'zerooldstyle', 'oneoldstyle', 'twooldstyle', 'threeoldstyle', 'fouroldstyle', 'fiveoldstyle', 'sixoldstyle', 'sevenoldstyle', 'eightoldstyle', 'nineoldstyle', 'commasuperior', 'threequartersemdash', 'periodsuperior', 'questionsmall', 'asuperior', 'bsuperior', 'centsuperior', 'dsuperior', 'esuperior', 'isuperior', 'lsuperior', 'msuperior', 'nsuperior', 'osuperior', 'rsuperior', 'ssuperior', 'tsuperior', 'ff', 'ffi', 'ffl', 'parenleftinferior', 'parenrightinferior', 'Circumflexsmall', 'hyphensuperior', 'Gravesmall', 'Asmall', 'Bsmall', 'Csmall', 'Dsmall', 'Esmall', 'Fsmall', 'Gsmall', 'Hsmall', 'Ismall', 'Jsmall', 'Ksmall', 'Lsmall', 'Msmall', 'Nsmall', 'Osmall', 'Psmall', 'Qsmall', 'Rsmall', 'Ssmall', 'Tsmall', 'Usmall', 'Vsmall', 'Wsmall', 'Xsmall', 'Ysmall', 'Zsmall', 'colonmonetary', 'onefitted', 'rupiah', 'Tildesmall', 'exclamdownsmall', 'centoldstyle', 'Lslashsmall', 'Scaronsmall', 'Zcaronsmall', 'Dieresissmall', 'Brevesmall', 'Caronsmall', 'Dotaccentsmall', 'Macronsmall', 'figuredash', 'hypheninferior', 'Ogoneksmall', 'Ringsmall', 'Cedillasmall', 'questiondownsmall', 'oneeighth', 'threeeighths', 'fiveeighths', 'seveneighths', 'onethird', 'twothirds', 'zerosuperior', 'foursuperior', 'fivesuperior', 'sixsuperior', 'sevensuperior', 'eightsuperior', 'ninesuperior', 'zeroinferior', 'oneinferior', 'twoinferior', 'threeinferior', 'fourinferior', 'fiveinferior', 'sixinferior', 'seveninferior', 'eightinferior', 'nineinferior', 'centinferior', 'dollarinferior', 'periodinferior', 'commainferior', 'Agravesmall', 'Aacutesmall', 'Acircumflexsmall', 'Atildesmall', 'Adieresissmall', 'Aringsmall', 'AEsmall', 'Ccedillasmall', 'Egravesmall', 'Eacutesmall', 'Ecircumflexsmall', 'Edieresissmall', 'Igravesmall', 'Iacutesmall', 'Icircumflexsmall', 'Idieresissmall', 'Ethsmall', 'Ntildesmall', 'Ogravesmall', 'Oacutesmall', 'Ocircumflexsmall', 'Otildesmall', 'Odieresissmall', 'OEsmall', 'Oslashsmall', 'Ugravesmall', 'Uacutesmall', 'Ucircumflexsmall', 'Udieresissmall', 'Yacutesmall', 'Thornsmall', 'Ydieresissmall', '001.000', '001.001', '001.002', '001.003', 'Black', 'Bold', 'Book', 'Light', 'Medium', 'Regular', 'Roman', 'Semibold']; @@ -29079,7 +29071,7 @@ var CFFCompiler = function CFFCompilerClosure() { exports.CFFCompiler = CFFCompiler; /***/ }), -/* 31 */ +/* 30 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -29097,7 +29089,7 @@ const ExpertSubsetCharset = ['.notdef', 'space', 'dollaroldstyle', 'dollarsuperi exports.ExpertSubsetCharset = ExpertSubsetCharset; /***/ }), -/* 32 */ +/* 31 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -29151,10 +29143,10 @@ function getEncoding(encodingName) { } /***/ }), -/* 33 */ +/* 32 */ /***/ (function(module, exports, __w_pdfjs_require__) { -var getLookupTableFactory = __w_pdfjs_require__(9).getLookupTableFactory; +var getLookupTableFactory = __w_pdfjs_require__(8).getLookupTableFactory; var getGlyphsUnicode = getLookupTableFactory(function (t) { t['A'] = 0x0041; t['AE'] = 0x00C6; @@ -33688,7 +33680,7 @@ exports.getGlyphsUnicode = getGlyphsUnicode; exports.getDingbatsGlyphsUnicode = getDingbatsGlyphsUnicode; /***/ }), -/* 34 */ +/* 33 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -33699,7 +33691,7 @@ Object.defineProperty(exports, "__esModule", { }); exports.getSupplementalGlyphMapForCalibri = exports.getSupplementalGlyphMapForArialBlack = exports.getGlyphMapForStandardFonts = exports.getSymbolsFonts = exports.getSerifFonts = exports.getNonStdFontMap = exports.getStdFontMap = void 0; -var _core_utils = __w_pdfjs_require__(9); +var _core_utils = __w_pdfjs_require__(8); const getStdFontMap = (0, _core_utils.getLookupTableFactory)(function (t) { t['ArialNarrow'] = 'Helvetica'; @@ -34431,10 +34423,10 @@ const getSupplementalGlyphMapForCalibri = (0, _core_utils.getLookupTableFactory) exports.getSupplementalGlyphMapForCalibri = getSupplementalGlyphMapForCalibri; /***/ }), -/* 35 */ +/* 34 */ /***/ (function(module, exports, __w_pdfjs_require__) { -var getLookupTableFactory = __w_pdfjs_require__(9).getLookupTableFactory; +var getLookupTableFactory = __w_pdfjs_require__(8).getLookupTableFactory; var getSpecialPUASymbols = getLookupTableFactory(function (t) { t[63721] = 0x00A9; t[63193] = 0x00A9; @@ -36408,7 +36400,7 @@ exports.getNormalizedUnicodes = getNormalizedUnicodes; exports.getUnicodeForGlyph = getUnicodeForGlyph; /***/ }), -/* 36 */ +/* 35 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -36421,13 +36413,13 @@ exports.FontRendererFactory = void 0; var _util = __w_pdfjs_require__(2); -var _cff_parser = __w_pdfjs_require__(30); +var _cff_parser = __w_pdfjs_require__(29); -var _glyphlist = __w_pdfjs_require__(33); +var _glyphlist = __w_pdfjs_require__(32); -var _encodings = __w_pdfjs_require__(32); +var _encodings = __w_pdfjs_require__(31); -var _stream = __w_pdfjs_require__(13); +var _stream = __w_pdfjs_require__(12); var FontRendererFactory = function FontRendererFactoryClosure() { function getLong(data, offset) { @@ -37362,7 +37354,7 @@ var FontRendererFactory = function FontRendererFactoryClosure() { exports.FontRendererFactory = FontRendererFactory; /***/ }), -/* 37 */ +/* 36 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -37375,9 +37367,9 @@ exports.Type1Parser = void 0; var _util = __w_pdfjs_require__(2); -var _encodings = __w_pdfjs_require__(32); +var _encodings = __w_pdfjs_require__(31); -var _stream = __w_pdfjs_require__(13); +var _stream = __w_pdfjs_require__(12); var HINTING_ENABLED = false; @@ -38065,7 +38057,7 @@ var Type1Parser = function Type1ParserClosure() { exports.Type1Parser = Type1Parser; /***/ }), -/* 38 */ +/* 37 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -38079,11 +38071,11 @@ exports.Pattern = void 0; var _util = __w_pdfjs_require__(2); -var _colorspace = __w_pdfjs_require__(24); +var _colorspace = __w_pdfjs_require__(23); -var _primitives = __w_pdfjs_require__(6); +var _primitives = __w_pdfjs_require__(5); -var _core_utils = __w_pdfjs_require__(9); +var _core_utils = __w_pdfjs_require__(8); var ShadingType = { FUNCTION_BASED: 1, @@ -39004,7 +38996,7 @@ function getTilingPatternIR(operatorList, dict, args) { } /***/ }), -/* 39 */ +/* 38 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -39308,7 +39300,7 @@ function bidi(str, startLevel, vertical) { } /***/ }), -/* 40 */ +/* 39 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -39319,7 +39311,7 @@ Object.defineProperty(exports, "__esModule", { }); exports.getMetrics = void 0; -var _core_utils = __w_pdfjs_require__(9); +var _core_utils = __w_pdfjs_require__(8); var getMetrics = (0, _core_utils.getLookupTableFactory)(function (t) { t['Courier'] = 600; @@ -42262,7 +42254,7 @@ var getMetrics = (0, _core_utils.getLookupTableFactory)(function (t) { exports.getMetrics = getMetrics; /***/ }), -/* 41 */ +/* 40 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -42276,9 +42268,9 @@ exports.PostScriptCompiler = exports.PostScriptEvaluator = exports.PDFFunctionFa var _util = __w_pdfjs_require__(2); -var _primitives = __w_pdfjs_require__(6); +var _primitives = __w_pdfjs_require__(5); -var _ps_parser = __w_pdfjs_require__(42); +var _ps_parser = __w_pdfjs_require__(41); let IsEvalSupportedCached = { get value() { @@ -43620,7 +43612,7 @@ var PostScriptCompiler = function PostScriptCompilerClosure() { exports.PostScriptCompiler = PostScriptCompiler; /***/ }), -/* 42 */ +/* 41 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -43633,7 +43625,7 @@ exports.PostScriptParser = exports.PostScriptLexer = void 0; var _util = __w_pdfjs_require__(2); -var _primitives = __w_pdfjs_require__(6); +var _primitives = __w_pdfjs_require__(5); class PostScriptParser { constructor(lexer) { @@ -43872,7 +43864,7 @@ class PostScriptLexer { exports.PostScriptLexer = PostScriptLexer; /***/ }), -/* 43 */ +/* 42 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -43998,7 +43990,7 @@ class MurmurHash3_64 { exports.MurmurHash3_64 = MurmurHash3_64; /***/ }), -/* 44 */ +/* 43 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -44009,11 +44001,11 @@ Object.defineProperty(exports, "__esModule", { }); exports.NativeImageDecoder = void 0; -var _colorspace = __w_pdfjs_require__(24); +var _colorspace = __w_pdfjs_require__(23); -var _jpeg_stream = __w_pdfjs_require__(19); +var _jpeg_stream = __w_pdfjs_require__(18); -var _stream = __w_pdfjs_require__(13); +var _stream = __w_pdfjs_require__(12); class NativeImageDecoder { constructor({ @@ -44077,7 +44069,7 @@ class NativeImageDecoder { exports.NativeImageDecoder = NativeImageDecoder; /***/ }), -/* 45 */ +/* 44 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -44090,15 +44082,15 @@ exports.PDFImage = void 0; var _util = __w_pdfjs_require__(2); -var _primitives = __w_pdfjs_require__(6); +var _primitives = __w_pdfjs_require__(5); -var _colorspace = __w_pdfjs_require__(24); +var _colorspace = __w_pdfjs_require__(23); -var _stream = __w_pdfjs_require__(13); +var _stream = __w_pdfjs_require__(12); -var _jpeg_stream = __w_pdfjs_require__(19); +var _jpeg_stream = __w_pdfjs_require__(18); -var _jpx = __w_pdfjs_require__(22); +var _jpx = __w_pdfjs_require__(21); var PDFImage = function PDFImageClosure() { function handleImageData(image, nativeDecoder) { @@ -44737,7 +44729,7 @@ var PDFImage = function PDFImageClosure() { exports.PDFImage = PDFImage; /***/ }), -/* 46 */ +/* 45 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -44751,7 +44743,7 @@ const isNodeJS = typeof process === 'object' && process + '' === '[object proces exports.isNodeJS = isNodeJS; /***/ }), -/* 47 */ +/* 46 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; @@ -45252,7 +45244,7 @@ class MessageHandler { exports.MessageHandler = MessageHandler; /***/ }), -/* 48 */ +/* 47 */ /***/ (function(module, exports, __w_pdfjs_require__) { "use strict"; diff --git a/browser/extensions/pdfjs/content/web/viewer.js b/browser/extensions/pdfjs/content/web/viewer.js index 2a9d8ab20baa..413c00faad37 100644 --- a/browser/extensions/pdfjs/content/web/viewer.js +++ b/browser/extensions/pdfjs/content/web/viewer.js @@ -592,7 +592,6 @@ let PDFViewerApplication = { if (this.supportsFullscreen) { this.pdfPresentationMode = new _pdf_presentation_mode.PDFPresentationMode({ container, - viewer, pdfViewer: this.pdfViewer, eventBus, contextMenuItems: appConfig.fullscreen @@ -7044,13 +7043,11 @@ const SWIPE_ANGLE_THRESHOLD = Math.PI / 6; class PDFPresentationMode { constructor({ container, - viewer = null, pdfViewer, eventBus, contextMenuItems = null }) { this.container = container; - this.viewer = viewer || container.firstElementChild; this.pdfViewer = pdfViewer; this.eventBus = eventBus; this.active = false; @@ -7089,7 +7086,7 @@ class PDFPresentationMode { } request() { - if (this.switchInProgress || this.active || !this.viewer.hasChildNodes()) { + if (this.switchInProgress || this.active || !this.pdfViewer.pagesCount) { return false; } @@ -9156,7 +9153,7 @@ class BaseViewer { return false; } - if (this.pageNumber < 1 || pageNumber > this.pagesCount) { + if (pageNumber < 1 || pageNumber > this.pagesCount) { console.error(`${this._name}.isPageVisible: "${pageNumber}" is out of bounds.`); return false; } diff --git a/browser/extensions/pdfjs/moz.yaml b/browser/extensions/pdfjs/moz.yaml index afec0747ba6b..33862b96513a 100644 --- a/browser/extensions/pdfjs/moz.yaml +++ b/browser/extensions/pdfjs/moz.yaml @@ -20,7 +20,7 @@ origin: # Human-readable identifier for this version/release # Generally "version NNN", "tag SSS", "bookmark SSS" - release: version 2.4.163 + release: version 2.4.176 # The package's license, where possible using the mnemonic from # https://spdx.org/licenses/