[api-minor] rm disableCreateObjectURL

mozilla · Feb 14, 2020 · e5413ed · e5413ed
1 parent 5174f0f
commit e5413ed
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 44 deletions.
diff --git a/src/core/evaluator.js b/src/core/evaluator.js
@@ -86,7 +86,6 @@ import { PDFImage } from "./image.js";
 
 var PartialEvaluator = (function PartialEvaluatorClosure() {
  const DefaultPartialEvaluatorOptions = {
- forceDataSchema: false,
  maxImageSize: -1,
  disableFontFace: false,
  ignoreErrors: false,

diff --git a/src/core/worker.js b/src/core/worker.js
@@ -383,7 +383,6 @@ var WorkerMessageHandler = {
  ensureNotTerminated();
 
  var evaluatorOptions = {
- forceDataSchema: data.disableCreateObjectURL,
  maxImageSize: data.maxImageSize,
  disableFontFace: data.disableFontFace,
  ignoreErrors: data.ignoreErrors,

diff --git a/src/display/api.js b/src/display/api.js
@@ -143,9 +143,6 @@ function setPDFNetworkStreamFactory(pdfNetworkStreamFactory) {
  * The default value is `false`.
  * NOTE: It is also necessary to disable streaming, see above,
  * in order for disabling of pre-fetching to work correctly.
- * @property {boolean} [disableCreateObjectURL] - Disable the use of
- * `URL.createObjectURL`, for compatibility with older browsers.
- * The default value is `false`.
  * @property {boolean} [pdfBug] - Enables special hooks for debugging
  * PDF.js (see `web/debugger.js`). The default value is `false`.
  */
@@ -257,10 +254,6 @@ function getDocument(src) {
  if (typeof params.disableAutoFetch !== "boolean") {
  params.disableAutoFetch = false;
  }
- if (typeof params.disableCreateObjectURL !== "boolean") {
- params.disableCreateObjectURL =
- apiCompatibilityParams.disableCreateObjectURL || false;
- }
 
  // Set the main-thread verbosity level.
  setVerbosityLevel(params.verbosity);
@@ -373,7 +366,6 @@ function _fetchDocument(worker, source, pdfDataRangeTransport, docId) {
  },
  maxImageSize: source.maxImageSize,
  disableFontFace: source.disableFontFace,
- disableCreateObjectURL: source.disableCreateObjectURL,
  postMessageTransfers: worker.postMessageTransfers,
  docBaseUrl: source.docBaseUrl,
  ignoreErrors: source.ignoreErrors,
@@ -2478,7 +2470,6 @@ class WorkerTransport {
  const params = this._params;
  return shadow(this, "loadingParams", {
  disableAutoFetch: params.disableAutoFetch,
- disableCreateObjectURL: params.disableCreateObjectURL,
  disableFontFace: params.disableFontFace,
  });
  }

diff --git a/src/display/api_compatibility.js b/src/display/api_compatibility.js
@@ -17,21 +17,6 @@ const compatibilityParams = Object.create(null);
 if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) {
  const { isNodeJS } = require("../shared/is_node.js");
 
- const userAgent =
- (typeof navigator !== "undefined" && navigator.userAgent) || "";
- const isIE = /Trident/.test(userAgent);
- const isIOSChrome = /CriOS/.test(userAgent);
-
- // Checks if possible to use URL.createObjectURL()
- // Support: IE, Chrome on iOS
- (function checkOnBlobSupport() {
- // Sometimes IE and Chrome on iOS losing the data created with
- // createObjectURL(), see issues #3977 and #8081.
- if (isIE || isIOSChrome) {
- compatibilityParams.disableCreateObjectURL = true;
- }
- })();
-
  // Support: Node.js
  (function checkFontFace() {
  // Node.js is missing native support for `@font-face`.

diff --git a/src/display/svg.js b/src/display/svg.js
@@ -438,7 +438,7 @@ if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) {
  let shadingCount = 0;
 
  SVGGraphics = class SVGGraphics {
- constructor(commonObjs, objs, forceDataSchema) {
+ constructor(commonObjs, objs, forceDataSchema = false) {
  this.svgFactory = new DOMSVGFactory();
 
  this.current = new SVGExtraState();

diff --git a/web/app_options.js b/web/app_options.js
@@ -43,6 +43,12 @@ const defaultOptions = {
  value: "",
  kind: OptionKind.VIEWER + OptionKind.PREFERENCE,
  },
+ disableCreateObjectURL: {
+ /** @type {boolean} */
+ value: false,
+ compatibility: viewerCompatibilityParams.disableCreateObjectURL,
+ kind: OptionKind.VIEWER,
+ },
  disableHistory: {
  /** @type {boolean} */
  value: false,
@@ -167,12 +173,6 @@ const defaultOptions = {
  value: false,
  kind: OptionKind.API + OptionKind.PREFERENCE,
  },
- disableCreateObjectURL: {
- /** @type {boolean} */
- value: false,
- compatibility: apiCompatibilityParams.disableCreateObjectURL,
- kind: OptionKind.API,
- },
  disableFontFace: {
  /** @type {boolean} */
  value: false,

diff --git a/web/download_manager.js b/web/download_manager.js
@@ -13,11 +13,8 @@
  * limitations under the License.
  */
 
-import {
- apiCompatibilityParams,
- createObjectURL,
- createValidAbsoluteUrl,
-} from "pdfjs-lib";
+import { createObjectURL, createValidAbsoluteUrl } from "pdfjs-lib";
+import { viewerCompatibilityParams } from "./viewer_compatibility.js";
 
 if (typeof PDFJSDev !== "undefined" && !PDFJSDev.test("CHROME || GENERIC")) {
  throw new Error(
@@ -27,7 +24,7 @@ if (typeof PDFJSDev !== "undefined" && !PDFJSDev.test("CHROME || GENERIC")) {
 }
 
 const DISABLE_CREATE_OBJECT_URL =
- apiCompatibilityParams.disableCreateObjectURL || false;
+ viewerCompatibilityParams.disableCreateObjectURL || false;
 
 function download(blobUrl, filename) {
  const a = document.createElement("a");

diff --git a/web/pdf_attachment_viewer.js b/web/pdf_attachment_viewer.js
@@ -92,6 +92,9 @@ class PDFAttachmentViewer {
  if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) {
  // The current URL is the viewer, let's use it and append the file.
  viewerUrl = "?file=" + encodeURIComponent(blobUrl + "#" + filename);
+ } else if (PDFJSDev.test("MOZCENTRAL")) {
+ // Let Firefox's content handler catch the URL and display the PDF.
+ viewerUrl = blobUrl + "?" + encodeURIComponent(filename);
  } else if (PDFJSDev.test("CHROME")) {
  // In the Chrome extension, the URL is rewritten using the history API
  // in viewer.js, so an absolute URL must be generated.
@@ -100,9 +103,6 @@ class PDFAttachmentViewer {
  chrome.runtime.getURL("/content/web/viewer.html") +
  "?file=" +
  encodeURIComponent(blobUrl + "#" + filename);
- } else if (PDFJSDev.test("MOZCENTRAL")) {
- // Let Firefox's content handler catch the URL and display the PDF.
- viewerUrl = blobUrl + "?" + encodeURIComponent(filename);
  }
  window.open(viewerUrl);
  return false;

diff --git a/web/pdf_print_service.js b/web/pdf_print_service.js
@@ -65,8 +65,7 @@ function PDFPrintService(pdfDocument, pagesOverview, printContainer, l10n) {
  this.pagesOverview = pagesOverview;
  this.printContainer = printContainer;
  this.l10n = l10n || NullL10n;
- this.disableCreateObjectURL =
- pdfDocument.loadingParams["disableCreateObjectURL"];
+ this.disableCreateObjectURL = AppOptions.get("disableCreateObjectURL");
  this.currentPage = -1;
  // The temporary canvas where renderPage paints one page at a time.
  this.scratchCanvas = document.createElement("canvas");

diff --git a/web/viewer_compatibility.js b/web/viewer_compatibility.js
@@ -23,9 +23,21 @@ if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) {
  (typeof navigator !== "undefined" && navigator.maxTouchPoints) || 1;
 
  const isAndroid = /Android/.test(userAgent);
+ const isIE = /Trident/.test(userAgent);
  const isIOS =
  /\b(iPad|iPhone|iPod)(?=;)/.test(userAgent) ||
  (platform === "MacIntel" && maxTouchPoints > 1);
+ const isIOSChrome = /CriOS/.test(userAgent);
+
+ // Checks if possible to use URL.createObjectURL()
+ // Support: IE, Chrome on iOS
+ (function checkOnBlobSupport() {
+ // Sometimes IE and Chrome on iOS losing the data created with
+ // createObjectURL(), see issues #3977 and #8081.
+ if (isIE || isIOSChrome) {
+ compatibilityParams.disableCreateObjectURL = true;
+ }
+ })();
 
  // Limit canvas size to 5 mega-pixels on mobile.
  // Support: Android, iOS