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

Use only one temp canvas for patterns

Browse Source 
This fixes a regression #3153 which was introduced by #2177.
The temp vanvases that are being created are not being re-used, which lead
to high memory use.
This commit is contained in:
Kalervo Kujala 2013-04-25 23:21:05 +03:00
parent ff616c830f
commit 8ac0690913
1 changed files with 87 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
src/pattern.js
View File

@ -20,6 +20,10 @@
'use strict'; 'use strict';
// This global variable is used to minimize the memory usage when patterns are
// used.
var temporaryPatternCanvas = null;
var PatternType = { var PatternType = {
AXIAL: 2, AXIAL: 2,
RADIAL: 3 RADIAL: 3
@ -268,23 +272,55 @@ var TilingPattern = (function TilingPatternClosure() {
COLORED: 1, COLORED: 1,
UNCOLORED: 2 UNCOLORED: 2
}; };
var MAX_PATTERN_SIZE = 4096;
var MAX_PATTERN_SIZE = 8192;
function TilingPattern(IR, color, ctx, objs, commonObjs) { function TilingPattern(IR, color, ctx, objs, commonObjs) {
var operatorList = IR[2]; this.name = IR[1][0].name;
this.operatorList = IR[2];
this.matrix = IR[3] || [1, 0, 0, 1, 0, 0]; this.matrix = IR[3] || [1, 0, 0, 1, 0, 0];
var bbox = IR[4]; this.bbox = IR[4];
var xstep = IR[5]; this.xstep = IR[5];
var ystep = IR[6]; this.ystep = IR[6];
var paintType = IR[7]; this.paintType = IR[7];
var tilingType = IR[8]; this.tilingType = IR[8];
this.color = color;
this.objs = objs;
this.commonObjs = commonObjs;
this.curMatrix = ctx.mozCurrentTransform;
this.type = 'Pattern';
this.ctx = ctx;
}
TilingPattern.getIR = function TilingPattern_getIR(operatorList, dict, args) {
var matrix = dict.get('Matrix');
var bbox = dict.get('BBox');
var xstep = dict.get('XStep');
var ystep = dict.get('YStep');
var paintType = dict.get('PaintType');
var tilingType = dict.get('TilingType');
return [
'TilingPattern', args, operatorList, matrix, bbox, xstep, ystep,
paintType, tilingType
];
};
TilingPattern.prototype = {
createPatternCanvas: function TilinPattern_createPatternCanvas(tmpCanvas) {
var operatorList = this.operatorList;
var bbox = this.bbox;
var xstep = this.xstep;
var ystep = this.ystep;
var paintType = this.paintType;
var tilingType = this.tilingType;
var color = this.color;
var objs = this.objs;
var commonObjs = this.commonObjs;
var ctx = this.ctx;
TODO('TilingType: ' + tilingType); TODO('TilingType: ' + tilingType);
this.curMatrix = ctx.mozCurrentTransform;
this.ctx = ctx;
this.type = 'Pattern';
var x0 = bbox[0], y0 = bbox[1], x1 = bbox[2], y1 = bbox[3]; var x0 = bbox[0], y0 = bbox[1], x1 = bbox[2], y1 = bbox[3];
var topLeft = [x0, y0]; var topLeft = [x0, y0];
@ -310,7 +346,8 @@ var TilingPattern = (function TilingPatternClosure() {
height = Math.min(Math.ceil(Math.abs(height * combinedScale[1])), height = Math.min(Math.ceil(Math.abs(height * combinedScale[1])),
MAX_PATTERN_SIZE); MAX_PATTERN_SIZE);
var tmpCanvas = createScratchCanvas(width, height); tmpCanvas.width = width;
tmpCanvas.height = height;
// set the new canvas element context as the graphics context // set the new canvas element context as the graphics context
var tmpCtx = tmpCanvas.getContext('2d'); var tmpCtx = tmpCanvas.getContext('2d');
@ -328,25 +365,8 @@ var TilingPattern = (function TilingPatternClosure() {
this.clipBbox(graphics, bbox, x0, y0, x1, y1); this.clipBbox(graphics, bbox, x0, y0, x1, y1);
graphics.executeOperatorList(operatorList); graphics.executeOperatorList(operatorList);
},
this.canvas = tmpCanvas;
}
TilingPattern.getIR = function TilingPattern_getIR(operatorList, dict, args) {
var matrix = dict.get('Matrix');
var bbox = dict.get('BBox');
var xstep = dict.get('XStep');
var ystep = dict.get('YStep');
var paintType = dict.get('PaintType');
var tilingType = dict.get('TilingType');
return [
'TilingPattern', args, operatorList, matrix, bbox, xstep, ystep,
paintType, tilingType
];
};
TilingPattern.prototype = {
setScale: function TilingPattern_setScale(width, height, xstep, ystep) { setScale: function TilingPattern_setScale(width, height, xstep, ystep) {
this.scale = [width / xstep, height / ystep]; this.scale = [width / xstep, height / ystep];
}, },
@ -392,15 +412,19 @@ var TilingPattern = (function TilingPatternClosure() {
}, },
getPattern: function TilingPattern_getPattern() { getPattern: function TilingPattern_getPattern() {
var matrix = this.matrix; // The temporary canvas is created only because the memory is released
var curMatrix = this.curMatrix; // more quickly than creating multiple temporary canvases.
var ctx = this.ctx; if (temporaryPatternCanvas === null) {
temporaryPatternCanvas = createScratchCanvas(0, 0);
}
this.createPatternCanvas(temporaryPatternCanvas);
ctx.setTransform.apply(ctx, curMatrix); var ctx = this.ctx;
ctx.transform.apply(ctx, matrix); ctx.setTransform.apply(ctx, this.curMatrix);
ctx.transform.apply(ctx, this.matrix);
this.scaleToContext(); this.scaleToContext();
return ctx.createPattern(this.canvas, 'repeat'); return ctx.createPattern(temporaryPatternCanvas, 'repeat');
} }
}; };