Rename FontFace to FontFaceObject

This name clashes with the FontFace constructor from the Font Loading CSS module:
http://dev.w3.org/csswg/css-font-loading/#font-face-constructor
This commit is contained in:
Rob Wu 2014-09-30 19:33:16 +02:00
parent a10fde165c
commit 6a230af332
2 changed files with 10 additions and 9 deletions

View file

@ -17,8 +17,9 @@
/* globals PDFJS, isArrayBuffer, error, combineUrl, createPromiseCapability,
StatTimer, globalScope, MessageHandler, info, FontLoader, Util, warn,
Promise, PasswordResponses, PasswordException, InvalidPDFException,
MissingPDFException, UnknownErrorException, FontFace, loadJpegStream,
createScratchCanvas, CanvasGraphics, UnexpectedResponseException */
MissingPDFException, UnknownErrorException, FontFaceObject,
loadJpegStream, createScratchCanvas, CanvasGraphics,
UnexpectedResponseException */
'use strict';
@ -962,7 +963,7 @@ var WorkerTransport = (function WorkerTransportClosure() {
this.commonObjs.resolve(id, error);
break;
} else {
font = new FontFace(exportedData);
font = new FontFaceObject(exportedData);
}
FontLoader.bind(