cleanup
This commit is contained in:
parent
8d09c0d7a4
commit
daf4979e2f
15
fonts.js
15
fonts.js
@ -27,17 +27,6 @@ var FontMeasure = (function FontMeasure() {
|
|||||||
var ctx = document.createElement('canvas').getContext('2d');
|
var ctx = document.createElement('canvas').getContext('2d');
|
||||||
ctx.scale(1 / kScalePrecision, 1);
|
ctx.scale(1 / kScalePrecision, 1);
|
||||||
|
|
||||||
/*
|
|
||||||
function FontInfo(name, data, properties) {
|
|
||||||
this.name = name;
|
|
||||||
this.data = data;
|
|
||||||
this.properties = properties;
|
|
||||||
this.id = fontCount++;
|
|
||||||
this.loading = true;
|
|
||||||
this.sizes = [];
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
var current;
|
var current;
|
||||||
var measureCache;
|
var measureCache;
|
||||||
|
|
||||||
@ -55,8 +44,6 @@ var FontMeasure = (function FontMeasure() {
|
|||||||
},
|
},
|
||||||
measureText: function fonts_measureText(text) {
|
measureText: function fonts_measureText(text) {
|
||||||
var width;
|
var width;
|
||||||
// something is wrong with the caching, it is messing up page 12 in
|
|
||||||
// the tracemonkey paper
|
|
||||||
if (measureCache && (width = measureCache[text]))
|
if (measureCache && (width = measureCache[text]))
|
||||||
return width;
|
return width;
|
||||||
width = ctx.measureText(text).width / kScalePrecision;
|
width = ctx.measureText(text).width / kScalePrecision;
|
||||||
@ -359,6 +346,7 @@ var Font = (function() {
|
|||||||
this.name = name;
|
this.name = name;
|
||||||
this.textMatrix = properties.textMatrix || IDENTITY_MATRIX;
|
this.textMatrix = properties.textMatrix || IDENTITY_MATRIX;
|
||||||
this.encoding = properties.encoding;
|
this.encoding = properties.encoding;
|
||||||
|
this.sizes = [];
|
||||||
|
|
||||||
// If the font is to be ignored, register it like an already loaded font
|
// If the font is to be ignored, register it like an already loaded font
|
||||||
// to avoid the cost of waiting for it be be loaded by the platform.
|
// to avoid the cost of waiting for it be be loaded by the platform.
|
||||||
@ -731,7 +719,6 @@ var Font = (function() {
|
|||||||
font: null,
|
font: null,
|
||||||
mimetype: null,
|
mimetype: null,
|
||||||
encoding: null,
|
encoding: null,
|
||||||
sizes: [],
|
|
||||||
|
|
||||||
checkAndRepair: function font_checkAndRepair(name, font, properties) {
|
checkAndRepair: function font_checkAndRepair(name, font, properties) {
|
||||||
function readTableEntry(file) {
|
function readTableEntry(file) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user