Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename FontFace to FontFaceObject

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/display/api.js
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(

12
src/display/font_loader.js
View File

@ -271,8 +271,8 @@ var FontLoader = {
//#endif
};
var FontFace = (function FontFaceClosure() {
function FontFace(name, file, properties) {
var FontFaceObject = (function FontFaceObjectClosure() {
function FontFaceObject(name, file, properties) {
this.compiledGlyphs = {};
if (arguments.length === 1) {
// importing translated data
@ -283,8 +283,8 @@ var FontFace = (function FontFaceClosure() {
return;
}
}
FontFace.prototype = {
bindDOM: function FontFace_bindDOM() {
FontFaceObject.prototype = {
bindDOM: function FontFaceObject_bindDOM() {
if (!this.data) {
return null;
}
@ -311,7 +311,7 @@ var FontFace = (function FontFaceClosure() {
return rule;
},
getPathGenerator: function (objs, character) {
getPathGenerator: function FontLoader_getPathGenerator(objs, character) {
if (!(character in this.compiledGlyphs)) {
var js = objs.get(this.loadedName + '_path_' + character);
/*jshint -W054 */
@ -320,5 +320,5 @@ var FontFace = (function FontFaceClosure() {
return this.compiledGlyphs[character];
}
};
return FontFace;
return FontFaceObject;
})();