Commit 25eaf245 authored by Ryan VanderMeulen's avatar Ryan VanderMeulen
Browse files

Bug 1575851 - Update pdf.js to version 2.3.101. r=bdahl 

Differential Revision: https://phabricator.services.mozilla.com/D43068

--HG--
extra : moz-landing-system : lando
parent d1abffd1

browser/extensions/pdfjs/README.mozilla

+2 −2
Original line number Diff line number Diff line 
This is the PDF.js project output, https://github.com/mozilla/pdf.js



Current extension version is: 2.3.86

Current extension version is: 2.3.101



Taken from upstream commit: 02dcd202
 
Taken from upstream commit: 31f31930

browser/extensions/pdfjs/content/build/pdf.js

+49 −32
Original line number Diff line number Diff line
@@ -123,8 +123,8 @@ return /******/ (function(modules) { // webpackBootstrap 
"use strict";





var pdfjsVersion = '2.3.86';

var pdfjsBuild = '02dcd202';

var pdfjsVersion = '2.3.101';

var pdfjsBuild = '31f31930';



var pdfjsSharedUtil = __w_pdfjs_require__(1);
@@ -1322,7 +1322,7 @@ function _fetchDocument(worker, source, pdfDataRangeTransport, docId) { 


  return worker.messageHandler.sendWithPromise('GetDocRequest', {

    docId,

    apiVersion: '2.3.86',

    apiVersion: '2.3.101',

    source: {

      data: source.data,

      url: source.url,
@@ -3118,9 +3118,9 @@ const InternalRenderTask = function InternalRenderTaskClosure() { 
  return InternalRenderTask;

}();



const version = '2.3.86';

const version = '2.3.101';

exports.version = version;

const build = '02dcd202';

const build = '31f31930';

exports.build = build;



/***/ }),
@@ -3397,9 +3397,21 @@ const LinkTargetStringMap = ['', '_self', '_blank', '_parent', '_top']; 
function addLinkAttributes(link, {

  url,

  target,

  rel

  rel,

  enabled = true

} = {}) {

  link.href = link.title = url ? (0, _util.removeNullCharacters)(url) : '';

  const urlNullRemoved = url ? (0, _util.removeNullCharacters)(url) : '';



  if (enabled) {

    link.href = link.title = urlNullRemoved;

  } else {

    link.href = '';

    link.title = `Disabled: ${urlNullRemoved}`;



    link.onclick = () => {

      return false;

    };

  }



  if (url) {

    const LinkTargetValues = Object.values(LinkTarget);
@@ -8281,8 +8293,7 @@ var renderTextLayer = function renderTextLayerClosure() { 
      fontAscent = (1 + style.descent) * fontAscent;

    }



    var left;

    var top;

    let left, top;



    if (angle === 0) {

      left = tx[4];
@@ -8296,8 +8307,13 @@ var renderTextLayer = function renderTextLayerClosure() { 
    styleBuf[3] = top;

    styleBuf[5] = fontHeight;

    styleBuf[7] = style.fontFamily;

    textDivProperties.style = styleBuf.join('');

    textDiv.setAttribute('style', textDivProperties.style);

    const styleStr = styleBuf.join('');



    if (task._enhanceTextSelection) {

      textDivProperties.style = styleStr;

    }



    textDiv.setAttribute('style', styleStr);

    textDiv.textContent = geom.str;



    if (task._fontInspectorEnabled) {
@@ -8817,46 +8833,46 @@ var renderTextLayer = function renderTextLayerClosure() { 
      }



      for (var i = 0, ii = this._textDivs.length; i < ii; i++) {

        var div = this._textDivs[i];

        const div = this._textDivs[i];



        var divProperties = this._textDivProperties.get(div);

        const divProps = this._textDivProperties.get(div);



        if (divProperties.isWhitespace) {

        if (divProps.isWhitespace) {

          continue;

        }



        if (expandDivs) {

          var transform = '',

          let transform = '',

              padding = '';



          if (divProperties.scale !== 1) {

            transform = 'scaleX(' + divProperties.scale + ')';

          if (divProps.scale !== 1) {

            transform = `scaleX(${divProps.scale})`;

          }



          if (divProperties.angle !== 0) {

            transform = 'rotate(' + divProperties.angle + 'deg) ' + transform;

          if (divProps.angle !== 0) {

            transform = `rotate(${divProps.angle}deg) ${transform}`;

          }



          if (divProperties.paddingLeft !== 0) {

            padding += ' padding-left: ' + divProperties.paddingLeft / divProperties.scale + 'px;';

            transform += ' translateX(' + -divProperties.paddingLeft / divProperties.scale + 'px)';

          if (divProps.paddingLeft !== 0) {

            padding += ` padding-left: ${divProps.paddingLeft / divProps.scale}px;`;

            transform += ` translateX(${-divProps.paddingLeft / divProps.scale}px)`;

          }



          if (divProperties.paddingTop !== 0) {

            padding += ' padding-top: ' + divProperties.paddingTop + 'px;';

            transform += ' translateY(' + -divProperties.paddingTop + 'px)';

          if (divProps.paddingTop !== 0) {

            padding += ` padding-top: ${divProps.paddingTop}px;`;

            transform += ` translateY(${-divProps.paddingTop}px)`;

          }



          if (divProperties.paddingRight !== 0) {

            padding += ' padding-right: ' + divProperties.paddingRight / divProperties.scale + 'px;';

          if (divProps.paddingRight !== 0) {

            padding += ` padding-right: ${divProps.paddingRight / divProps.scale}px;`;

          }



          if (divProperties.paddingBottom !== 0) {

            padding += ' padding-bottom: ' + divProperties.paddingBottom + 'px;';

          if (divProps.paddingBottom !== 0) {

            padding += ` padding-bottom: ${divProps.paddingBottom}px;`;

          }



          if (padding !== '') {

            div.setAttribute('style', divProperties.style + padding);

            div.setAttribute('style', divProps.style + padding);

          }



          if (transform !== '') {
@@ -8864,7 +8880,7 @@ var renderTextLayer = function renderTextLayerClosure() { 
          }

        } else {

          div.style.padding = 0;

          div.style.transform = divProperties.originalTransform || '';

          div.style.transform = divProps.originalTransform || '';

        }

      }

    }
@@ -9123,7 +9139,8 @@ class LinkAnnotationElement extends AnnotationElement { 
    (0, _display_utils.addLinkAttributes)(link, {

      url: data.url,

      target: data.newWindow ? _display_utils.LinkTarget.BLANK : linkService.externalLinkTarget,

      rel: linkService.externalLinkRel

      rel: linkService.externalLinkRel,

      enabled: linkService.externalLinkEnabled

    });



    if (!data.url) {

browser/extensions/pdfjs/content/build/pdf.worker.js

+26 −28
Original line number Diff line number Diff line
@@ -123,8 +123,8 @@ return /******/ (function(modules) { // webpackBootstrap 
"use strict";

















const pdfjsVersion = '2.3.86';









const pdfjsBuild = '02dcd202';









const pdfjsVersion = '2.3.101';









const pdfjsBuild = '31f31930';

















const pdfjsCoreWorker = __w_pdfjs_require__(1);
















@@ -240,7 +240,7 @@ var WorkerMessageHandler = {







    var WorkerTasks = [];









    const verbosity = (0, _util.getVerbosityLevel)();









    let apiVersion = docParams.apiVersion;









    let workerVersion = '2.3.86';









    let workerVersion = '2.3.101';

















    if (apiVersion !== workerVersion) {









      throw new Error(`The API version "${apiVersion}" does not match ` + `the Worker version "${workerVersion}".`);








@@ -4679,7 +4679,7 @@ var XRef = function XRefClosure() {







    this.pdfManager = pdfManager;









    this.entries = [];









    this.xrefstms = Object.create(null);









    this.cache = [];









    this._cacheMap = new Map();









    this.stats = {









      streamTypes: Object.create(null),









      fontTypes: Object.create(null)








@@ -5242,21 +5242,21 @@ var XRef = function XRefClosure() {







      return null;









    },









    fetchIfRef: function XRef_fetchIfRef(obj, suppressEncryption) {









      if (!(0, _primitives.isRef)(obj)) {









        return obj;









      if (obj instanceof _primitives.Ref) {









        return this.fetch(obj, suppressEncryption);









      }

















      return this.fetch(obj, suppressEncryption);









      return obj;









    },









    fetch: function XRef_fetch(ref, suppressEncryption) {









      if (!(0, _primitives.isRef)(ref)) {









      if (!(ref instanceof _primitives.Ref)) {









        throw new Error('ref object is not a reference');









      }

















      var num = ref.num;









      const num = ref.num;

















      if (num in this.cache) {









        var cacheEntry = this.cache[num];









      if (this._cacheMap.has(num)) {









        const cacheEntry = this._cacheMap.get(num);

















        if (cacheEntry instanceof _primitives.Dict && !cacheEntry.objId) {









          cacheEntry.objId = ref.toString();








@@ -5265,10 +5265,12 @@ var XRef = function XRefClosure() {







        return cacheEntry;









      }

















      var xrefEntry = this.getEntry(num);









      let xrefEntry = this.getEntry(num);

















      if (xrefEntry === null) {









        return this.cache[num] = null;









        this._cacheMap.set(num, xrefEntry);

















        return xrefEntry;









      }

















      if (xrefEntry.uncompressed) {








@@ -5335,7 +5337,7 @@ var XRef = function XRefClosure() {







      }

















      if (!(0, _primitives.isStream)(xrefEntry)) {









        this.cache[num] = xrefEntry;









        this._cacheMap.set(num, xrefEntry);









      }

















      return xrefEntry;








@@ -5392,7 +5394,7 @@ var XRef = function XRefClosure() {







        var entry = this.entries[num];

















        if (entry && entry.offset === tableOffset && entry.gen === i) {









          this.cache[num] = entries[i];









          this._cacheMap.set(num, entries[i]);









        }









      }
















@@ -5406,11 +5408,11 @@ var XRef = function XRefClosure() {







    },

















    async fetchIfRefAsync(obj, suppressEncryption) {









      if (!(0, _primitives.isRef)(obj)) {









        return obj;









      if (obj instanceof _primitives.Ref) {









        return this.fetchAsync(obj, suppressEncryption);









      }

















      return this.fetchAsync(obj, suppressEncryption);









      return obj;









    },

















    async fetchAsync(ref, suppressEncryption) {








@@ -5912,7 +5914,7 @@ class Parser {







    }









  }

















  getObj(cipherTransform) {









  getObj(cipherTransform = null) {









    const buf1 = this.buf1;









    this.shift();
















@@ -5980,27 +5982,23 @@ class Parser {







    }

















    if (Number.isInteger(buf1)) {









      const num = buf1;

















      if (Number.isInteger(this.buf1) && (0, _primitives.isCmd)(this.buf2, 'R')) {









        const ref = _primitives.Ref.get(num, this.buf1);









        const ref = _primitives.Ref.get(buf1, this.buf1);

















        this.shift();









        this.shift();









        return ref;









      }

















      return num;









      return buf1;









    }

















    if ((0, _util.isString)(buf1)) {









      let str = buf1;

















    if (typeof buf1 === 'string') {









      if (cipherTransform) {









        str = cipherTransform.decryptString(str);









        return cipherTransform.decryptString(buf1);









      }

















      return str;









      return buf1;









    }

















    return buf1;

























browser/extensions/pdfjs/content/web/viewer.js



+7
−2






























Original line number
Diff line number
Diff line







@@ -876,6 +876,7 @@ let PDFViewerApplication = {







    this.pdfLoadingTask = loadingTask;



















    loadingTask.onPassword = (updateCallback, reason) => {









      this.pdfLinkService.externalLinkEnabled = false;









      this.passwordPrompt.setUpdateCallback(updateCallback, reason);









      this.passwordPrompt.open();









    };








@@ -6407,11 +6408,13 @@ class PDFLinkService {







  constructor({









    eventBus,









    externalLinkTarget = null,









    externalLinkRel = null









    externalLinkRel = null,









    externalLinkEnabled = true









  } = {}) {









    this.eventBus = eventBus || (0, _ui_utils.getGlobalEventBus)();









    this.externalLinkTarget = externalLinkTarget;









    this.externalLinkRel = externalLinkRel;









    this.externalLinkEnabled = externalLinkEnabled;









    this.baseUrl = null;









    this.pdfDocument = null;









    this.pdfViewer = null;








@@ -6779,6 +6782,7 @@ class SimpleLinkService {







  constructor() {









    this.externalLinkTarget = null;









    this.externalLinkRel = null;









    this.externalLinkEnabled = true;









  }



















  get pagesCount() {








@@ -6877,7 +6881,8 @@ class PDFOutlineViewer {







      (0, _pdfjsLib.addLinkAttributes)(element, {









        url,









        target: newWindow ? _pdfjsLib.LinkTarget.BLANK : linkService.externalLinkTarget,









        rel: linkService.externalLinkRel









        rel: linkService.externalLinkRel,









        enabled: linkService.externalLinkEnabled









      });









      return;









    }
































browser/extensions/pdfjs/moz.yaml



+1
−1






























Original line number
Diff line number
Diff line







@@ -20,7 +20,7 @@ origin:

















  # Human-readable identifier for this version/release









  # Generally "version NNN", "tag SSS", "bookmark SSS"









  release: version 2.3.86









  release: version 2.3.101



















  # The package's license, where possible using the mnemonic from









  # https://spdx.org/licenses/