mirrors/pdf.js
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2025-04-26 10:08:06 +02:00
Code Activity

Merge pull request #13105 from Snuffleupagus/BasePdfManager-parseDocBaseUrl

Browse source 
Improve memory usage around the `BasePdfManager.docBaseUrl` parameter (PR 7689 follow-up)
This commit is contained in:
Tim van der Meij 2021-03-19 23:03:20 +01:00 • committed by GitHub
commit 8269ddbd16
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 251 additions and 244 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/core/pdf_manager.js
View file

@ -13,17 +13,23 @@
* limitations under the License.
*/
import {
createValidAbsoluteUrl,
shadow,
unreachable,
warn,
} from "../shared/util.js";
import { createValidAbsoluteUrl, unreachable, warn } from "../shared/util.js";
import { ChunkedStreamManager } from "./chunked_stream.js";
import { MissingDataException } from "./core_utils.js";
import { PDFDocument } from "./document.js";
import { Stream } from "./stream.js";
function parseDocBaseUrl(url) {
if (url) {
const absoluteUrl = createValidAbsoluteUrl(url);
if (absoluteUrl) {
return absoluteUrl.href;
}
warn(`Invalid absolute docBaseUrl: "${url}".`);
}
return null;
}
class BasePdfManager {
constructor() {
if (this.constructor === BasePdfManager) {
@ -40,16 +46,7 @@ class BasePdfManager {
}
get docBaseUrl() {
let docBaseUrl = null;
if (this._docBaseUrl) {
const absoluteUrl = createValidAbsoluteUrl(this._docBaseUrl);
if (absoluteUrl) {
docBaseUrl = absoluteUrl.href;
} else {
warn(`Invalid absolute docBaseUrl: "${this._docBaseUrl}".`);
}
}
return shadow(this, "docBaseUrl", docBaseUrl);
return this._docBaseUrl;
}
onLoadedStream() {
@ -111,7 +108,7 @@ class LocalPdfManager extends BasePdfManager {
this._docId = docId;
this._password = password;
this._docBaseUrl = docBaseUrl;
this._docBaseUrl = parseDocBaseUrl(docBaseUrl);
this.evaluatorOptions = evaluatorOptions;
this.enableXfa = enableXfa;
@ -154,7 +151,7 @@ class NetworkPdfManager extends BasePdfManager {
this._docId = docId;
this._password = args.password;
this._docBaseUrl = docBaseUrl;
this._docBaseUrl = parseDocBaseUrl(docBaseUrl);
this.msgHandler = args.msgHandler;
this.evaluatorOptions = evaluatorOptions;
this.enableXfa = enableXfa;