Skip to content

Commit

Permalink
Merge m-c to autoland, a=merge
Browse files Browse the repository at this point in the history
MozReview-Commit-ID: AHOFLdPkEou
  • Loading branch information
KWierso committed Aug 24, 2017
2 parents 7dc7ad2 + 2c209e0 commit c97fe87
Show file tree
Hide file tree
Showing 330 changed files with 95,186 additions and 87,085 deletions.
3 changes: 1 addition & 2 deletions accessible/base/Platform.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
#define mozilla_a11y_Platform_h

#include <stdint.h>

class nsString;
#include "nsStringFwd.h"

namespace mozilla {
namespace a11y {
Expand Down
2 changes: 1 addition & 1 deletion accessible/generic/Accessible.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
#include "nsIScrollableFrame.h"
#include "nsFocusManager.h"

#include "nsXPIDLString.h"
#include "nsString.h"
#include "nsUnicharUtils.h"
#include "nsReadableUtils.h"
#include "prdtoa.h"
Expand Down
3 changes: 2 additions & 1 deletion accessible/mac/MacUtils.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
#ifndef _MacUtils_H_
#define _MacUtils_H_

#include "nsStringFwd.h"

@class NSString;
class nsString;

namespace mozilla {
namespace a11y {
Expand Down
4 changes: 2 additions & 2 deletions browser/extensions/pdfjs/README.mozilla
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
This is the PDF.js project output, https://github.com/mozilla/pdf.js

Current extension version is: 1.9.441
Current extension version is: 1.9.456

Taken from upstream commit: 8c8d8fa2
Taken from upstream commit: cb10c03d
131 changes: 78 additions & 53 deletions browser/extensions/pdfjs/content/build/pdf.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ return /******/ (function(modules) { // webpackBootstrap
/******/ __w_pdfjs_require__.p = "";
/******/
/******/ // Load entry module and return exports
/******/ return __w_pdfjs_require__(__w_pdfjs_require__.s = 14);
/******/ return __w_pdfjs_require__(__w_pdfjs_require__.s = 15);
/******/ })
/************************************************************************/
/******/ ([
Expand All @@ -101,13 +101,12 @@ return /******/ (function(modules) { // webpackBootstrap
Object.defineProperty(exports, "__esModule", {
value: true
});
exports.unreachable = exports.warn = exports.utf8StringToString = exports.stringToUTF8String = exports.stringToPDFString = exports.stringToBytes = exports.string32 = exports.shadow = exports.setVerbosityLevel = exports.ReadableStream = exports.removeNullCharacters = exports.readUint32 = exports.readUint16 = exports.readInt8 = exports.log2 = exports.loadJpegStream = exports.isEvalSupported = exports.isLittleEndian = exports.createValidAbsoluteUrl = exports.isSameOrigin = exports.isNodeJS = exports.isSpace = exports.isString = exports.isNum = exports.isInt = exports.isEmptyObj = exports.isBool = exports.isArrayBuffer = exports.isArray = exports.info = exports.globalScope = exports.getVerbosityLevel = exports.getLookupTableFactory = exports.deprecated = exports.createObjectURL = exports.createPromiseCapability = exports.createBlob = exports.bytesToString = exports.assert = exports.arraysToBytes = exports.arrayByteLength = exports.FormatError = exports.XRefParseException = exports.Util = exports.UnknownErrorException = exports.UnexpectedResponseException = exports.TextRenderingMode = exports.StreamType = exports.StatTimer = exports.PasswordResponses = exports.PasswordException = exports.PageViewport = exports.NotImplementedException = exports.NativeImageDecoding = exports.MissingPDFException = exports.MissingDataException = exports.MessageHandler = exports.InvalidPDFException = exports.AbortException = exports.CMapCompressionType = exports.ImageKind = exports.FontType = exports.AnnotationType = exports.AnnotationFlag = exports.AnnotationFieldFlag = exports.AnnotationBorderStyleType = exports.UNSUPPORTED_FEATURES = exports.VERBOSITY_LEVELS = exports.OPS = exports.IDENTITY_MATRIX = exports.FONT_IDENTITY_MATRIX = undefined;
exports.unreachable = exports.warn = exports.utf8StringToString = exports.stringToUTF8String = exports.stringToPDFString = exports.stringToBytes = exports.string32 = exports.shadow = exports.setVerbosityLevel = exports.ReadableStream = exports.removeNullCharacters = exports.readUint32 = exports.readUint16 = exports.readInt8 = exports.log2 = exports.loadJpegStream = exports.isEvalSupported = exports.isLittleEndian = exports.createValidAbsoluteUrl = exports.isSameOrigin = exports.isNodeJS = exports.isSpace = exports.isString = exports.isNum = exports.isInt = exports.isEmptyObj = exports.isBool = exports.isArrayBuffer = exports.isArray = exports.info = exports.getVerbosityLevel = exports.getLookupTableFactory = exports.deprecated = exports.createObjectURL = exports.createPromiseCapability = exports.createBlob = exports.bytesToString = exports.assert = exports.arraysToBytes = exports.arrayByteLength = exports.FormatError = exports.XRefParseException = exports.Util = exports.UnknownErrorException = exports.UnexpectedResponseException = exports.TextRenderingMode = exports.StreamType = exports.StatTimer = exports.PasswordResponses = exports.PasswordException = exports.PageViewport = exports.NotImplementedException = exports.NativeImageDecoding = exports.MissingPDFException = exports.MissingDataException = exports.MessageHandler = exports.InvalidPDFException = exports.AbortException = exports.CMapCompressionType = exports.ImageKind = exports.FontType = exports.AnnotationType = exports.AnnotationFlag = exports.AnnotationFieldFlag = exports.AnnotationBorderStyleType = exports.UNSUPPORTED_FEATURES = exports.VERBOSITY_LEVELS = exports.OPS = exports.IDENTITY_MATRIX = exports.FONT_IDENTITY_MATRIX = undefined;

__w_pdfjs_require__(15);
__w_pdfjs_require__(16);

var _streams_polyfill = __w_pdfjs_require__(16);
var _streams_polyfill = __w_pdfjs_require__(17);

var globalScope = typeof window !== 'undefined' && window.Math === Math ? window : typeof global !== 'undefined' && global.Math === Math ? global : typeof self !== 'undefined' && self.Math === Math ? self : undefined;
var FONT_IDENTITY_MATRIX = [0.001, 0, 0, 0.001, 0, 0];
const NativeImageDecoding = {
NONE: 'none',
Expand Down Expand Up @@ -1426,7 +1425,6 @@ exports.createObjectURL = createObjectURL;
exports.deprecated = deprecated;
exports.getLookupTableFactory = getLookupTableFactory;
exports.getVerbosityLevel = getVerbosityLevel;
exports.globalScope = globalScope;
exports.info = info;
exports.isArray = isArray;
exports.isArrayBuffer = isArrayBuffer;
Expand Down Expand Up @@ -1472,6 +1470,12 @@ exports.DOMCMapReaderFactory = exports.DOMCanvasFactory = exports.DEFAULT_LINK_R

var _util = __w_pdfjs_require__(0);

var _global_scope = __w_pdfjs_require__(2);

var _global_scope2 = _interopRequireDefault(_global_scope);

function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

var DEFAULT_LINK_REL = 'noopener noreferrer nofollow';
class DOMCanvasFactory {
create(width, height) {
Expand Down Expand Up @@ -1621,7 +1625,7 @@ function getFilenameFromUrl(url) {
return url.substring(url.lastIndexOf('/', end) + 1, end);
}
function getDefaultSetting(id) {
var globalSettings = _util.globalScope.PDFJS;
var globalSettings = _global_scope2.default.PDFJS;
switch (id) {
case 'pdfBug':
return globalSettings ? globalSettings.pdfBug : false;
Expand Down Expand Up @@ -1716,6 +1720,15 @@ exports.DOMCMapReaderFactory = DOMCMapReaderFactory;
"use strict";


module.exports = typeof window !== 'undefined' && window.Math === Math ? window : typeof global !== 'undefined' && global.Math === Math ? global : typeof self !== 'undefined' && self.Math === Math ? self : {};

/***/ }),
/* 3 */
/***/ (function(module, exports, __w_pdfjs_require__) {

"use strict";


Object.defineProperty(exports, "__esModule", {
value: true
});
Expand Down Expand Up @@ -2360,7 +2373,7 @@ var AnnotationLayer = function AnnotationLayerClosure() {
exports.AnnotationLayer = AnnotationLayer;

/***/ }),
/* 3 */
/* 4 */
/***/ (function(module, exports, __w_pdfjs_require__) {

"use strict";
Expand All @@ -2375,13 +2388,19 @@ var _util = __w_pdfjs_require__(0);

var _dom_utils = __w_pdfjs_require__(1);

var _font_loader = __w_pdfjs_require__(11);
var _font_loader = __w_pdfjs_require__(12);

var _canvas = __w_pdfjs_require__(11);

var _canvas = __w_pdfjs_require__(10);
var _global_scope = __w_pdfjs_require__(2);

var _metadata = __w_pdfjs_require__(6);
var _global_scope2 = _interopRequireDefault(_global_scope);

var _transport_stream = __w_pdfjs_require__(13);
var _metadata = __w_pdfjs_require__(7);

var _transport_stream = __w_pdfjs_require__(14);

function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

var DEFAULT_RANGE_CHUNK_SIZE = 65536;
var isWorkerDisabled = false;
Expand Down Expand Up @@ -3391,10 +3410,10 @@ var WorkerTransport = function WorkerTransportClosure() {
break;
}
var fontRegistry = null;
if ((0, _dom_utils.getDefaultSetting)('pdfBug') && _util.globalScope.FontInspector && _util.globalScope['FontInspector'].enabled) {
if ((0, _dom_utils.getDefaultSetting)('pdfBug') && _global_scope2.default.FontInspector && _global_scope2.default['FontInspector'].enabled) {
fontRegistry = {
registerFont(font, url) {
_util.globalScope['FontInspector'].fontAdded(font, url);
_global_scope2.default['FontInspector'].fontAdded(font, url);
}
};
}
Expand Down Expand Up @@ -3731,8 +3750,8 @@ var InternalRenderTask = function InternalRenderTaskClosure() {
if (this.cancelled) {
return;
}
if ((0, _dom_utils.getDefaultSetting)('pdfBug') && _util.globalScope.StepperManager && _util.globalScope.StepperManager.enabled) {
this.stepper = _util.globalScope.StepperManager.create(this.pageNumber - 1);
if ((0, _dom_utils.getDefaultSetting)('pdfBug') && _global_scope2.default.StepperManager && _global_scope2.default.StepperManager.enabled) {
this.stepper = _global_scope2.default.StepperManager.create(this.pageNumber - 1);
this.stepper.init(this.operatorList);
this.stepper.nextBreakPoint = this.stepper.getNextBreakPoint();
}
Expand Down Expand Up @@ -3826,8 +3845,8 @@ var _UnsupportedManager = function UnsupportedManagerClosure() {
}();
var version, build;
{
exports.version = version = '1.9.441';
exports.build = build = '8c8d8fa2';
exports.version = version = '1.9.456';
exports.build = build = 'cb10c03d';
}
exports.getDocument = getDocument;
exports.LoopbackPort = LoopbackPort;
Expand All @@ -3841,7 +3860,7 @@ exports.version = version;
exports.build = build;

/***/ }),
/* 4 */
/* 5 */
/***/ (function(module, exports, __w_pdfjs_require__) {

"use strict";
Expand All @@ -3861,7 +3880,7 @@ var SVGGraphics = function () {
exports.SVGGraphics = SVGGraphics;

/***/ }),
/* 5 */
/* 6 */
/***/ (function(module, exports, __w_pdfjs_require__) {

"use strict";
Expand Down Expand Up @@ -4399,7 +4418,7 @@ var renderTextLayer = function renderTextLayerClosure() {
exports.renderTextLayer = renderTextLayer;

/***/ }),
/* 6 */
/* 7 */
/***/ (function(module, exports, __w_pdfjs_require__) {

"use strict";
Expand Down Expand Up @@ -4479,7 +4498,7 @@ Metadata.prototype = {
exports.Metadata = Metadata;

/***/ }),
/* 7 */
/* 8 */
/***/ (function(module, exports, __w_pdfjs_require__) {

"use strict";
Expand Down Expand Up @@ -4846,7 +4865,7 @@ var WebGLUtils = function WebGLUtilsClosure() {
exports.WebGLUtils = WebGLUtils;

/***/ }),
/* 8 */
/* 9 */
/***/ (function(module, exports, __w_pdfjs_require__) {

"use strict";
Expand All @@ -4857,28 +4876,34 @@ Object.defineProperty(exports, "__esModule", {
});
exports.PDFJS = exports.isWorker = exports.globalScope = undefined;

var _api = __w_pdfjs_require__(3);
var _api = __w_pdfjs_require__(4);

var _dom_utils = __w_pdfjs_require__(1);

var _util = __w_pdfjs_require__(0);

var _annotation_layer = __w_pdfjs_require__(2);
var _annotation_layer = __w_pdfjs_require__(3);

var _global_scope = __w_pdfjs_require__(2);

var _global_scope2 = _interopRequireDefault(_global_scope);

var _metadata = __w_pdfjs_require__(6);
var _metadata = __w_pdfjs_require__(7);

var _text_layer = __w_pdfjs_require__(5);
var _text_layer = __w_pdfjs_require__(6);

var _svg = __w_pdfjs_require__(4);
var _svg = __w_pdfjs_require__(5);

function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

var isWorker = typeof window === 'undefined';
if (!_util.globalScope.PDFJS) {
_util.globalScope.PDFJS = {};
if (!_global_scope2.default.PDFJS) {
_global_scope2.default.PDFJS = {};
}
var PDFJS = _util.globalScope.PDFJS;
var PDFJS = _global_scope2.default.PDFJS;
{
PDFJS.version = '1.9.441';
PDFJS.build = '8c8d8fa2';
PDFJS.version = '1.9.456';
PDFJS.build = 'cb10c03d';
}
PDFJS.pdfBug = false;
if (PDFJS.verbosity !== undefined) {
Expand Down Expand Up @@ -4955,12 +4980,12 @@ PDFJS.renderTextLayer = _text_layer.renderTextLayer;
PDFJS.Metadata = _metadata.Metadata;
PDFJS.SVGGraphics = _svg.SVGGraphics;
PDFJS.UnsupportedManager = _api._UnsupportedManager;
exports.globalScope = _util.globalScope;
exports.globalScope = _global_scope2.default;
exports.isWorker = isWorker;
exports.PDFJS = PDFJS;

/***/ }),
/* 9 */
/* 10 */
/***/ (function(module, exports, __w_pdfjs_require__) {

"use strict";
Expand Down Expand Up @@ -7976,7 +8001,7 @@ exports.PDFJS = PDFJS;
}]));

/***/ }),
/* 10 */
/* 11 */
/***/ (function(module, exports, __w_pdfjs_require__) {

"use strict";
Expand All @@ -7989,9 +8014,9 @@ exports.CanvasGraphics = undefined;

var _util = __w_pdfjs_require__(0);

var _pattern_helper = __w_pdfjs_require__(12);
var _pattern_helper = __w_pdfjs_require__(13);

var _webgl = __w_pdfjs_require__(7);
var _webgl = __w_pdfjs_require__(8);

var MIN_FONT_SIZE = 16;
var MAX_FONT_SIZE = 100;
Expand Down Expand Up @@ -9705,7 +9730,7 @@ var CanvasGraphics = function CanvasGraphicsClosure() {
exports.CanvasGraphics = CanvasGraphics;

/***/ }),
/* 11 */
/* 12 */
/***/ (function(module, exports, __w_pdfjs_require__) {

"use strict";
Expand Down Expand Up @@ -9830,7 +9855,7 @@ exports.FontFaceObject = FontFaceObject;
exports.FontLoader = FontLoader;

/***/ }),
/* 12 */
/* 13 */
/***/ (function(module, exports, __w_pdfjs_require__) {

"use strict";
Expand All @@ -9843,7 +9868,7 @@ exports.TilingPattern = exports.getShadingPatternFromIR = undefined;

var _util = __w_pdfjs_require__(0);

var _webgl = __w_pdfjs_require__(7);
var _webgl = __w_pdfjs_require__(8);

var ShadingIRs = {};
ShadingIRs.RadialAxial = {
Expand Down Expand Up @@ -10202,7 +10227,7 @@ exports.getShadingPatternFromIR = getShadingPatternFromIR;
exports.TilingPattern = TilingPattern;

/***/ }),
/* 13 */
/* 14 */
/***/ (function(module, exports, __w_pdfjs_require__) {

"use strict";
Expand Down Expand Up @@ -10438,21 +10463,21 @@ var PDFDataTransportStream = function PDFDataTransportStreamClosure() {
exports.PDFDataTransportStream = PDFDataTransportStream;

/***/ }),
/* 14 */
/* 15 */
/***/ (function(module, exports, __w_pdfjs_require__) {

"use strict";


var pdfjsVersion = '1.9.441';
var pdfjsBuild = '8c8d8fa2';
var pdfjsVersion = '1.9.456';
var pdfjsBuild = 'cb10c03d';
var pdfjsSharedUtil = __w_pdfjs_require__(0);
var pdfjsDisplayGlobal = __w_pdfjs_require__(8);
var pdfjsDisplayAPI = __w_pdfjs_require__(3);
var pdfjsDisplayTextLayer = __w_pdfjs_require__(5);
var pdfjsDisplayAnnotationLayer = __w_pdfjs_require__(2);
var pdfjsDisplayGlobal = __w_pdfjs_require__(9);
var pdfjsDisplayAPI = __w_pdfjs_require__(4);
var pdfjsDisplayTextLayer = __w_pdfjs_require__(6);
var pdfjsDisplayAnnotationLayer = __w_pdfjs_require__(3);
var pdfjsDisplayDOMUtils = __w_pdfjs_require__(1);
var pdfjsDisplaySVG = __w_pdfjs_require__(4);
var pdfjsDisplaySVG = __w_pdfjs_require__(5);
;
exports.PDFJS = pdfjsDisplayGlobal.PDFJS;
exports.build = pdfjsDisplayAPI.build;
Expand Down Expand Up @@ -10485,7 +10510,7 @@ exports.addLinkAttributes = pdfjsDisplayDOMUtils.addLinkAttributes;
exports.StatTimer = pdfjsSharedUtil.StatTimer;

/***/ }),
/* 15 */
/* 16 */
/***/ (function(module, exports, __w_pdfjs_require__) {

"use strict";
Expand All @@ -10494,7 +10519,7 @@ exports.StatTimer = pdfjsSharedUtil.StatTimer;
;

/***/ }),
/* 16 */
/* 17 */
/***/ (function(module, exports, __w_pdfjs_require__) {

"use strict";
Expand All @@ -10514,7 +10539,7 @@ if (typeof ReadableStream !== 'undefined') {
if (isReadableStreamSupported) {
exports.ReadableStream = ReadableStream;
} else {
exports.ReadableStream = __w_pdfjs_require__(9).ReadableStream;
exports.ReadableStream = __w_pdfjs_require__(10).ReadableStream;
}

/***/ })
Expand Down
Loading

0 comments on commit c97fe87

Please sign in to comment.