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

canvas.js minor optimizations

Browse Source
This commit is contained in:
p01 2014-06-02 14:46:59 +02:00
parent 35e418c603
commit 412febe4a4
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/display/canvas.js
View File

@ -940,18 +940,15 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
var old = this.current; var old = this.current;
this.stateStack.push(old); this.stateStack.push(old);
this.current = old.clone(); this.current = old.clone();
if (this.current.activeSMask) {
this.current.activeSMask = null; this.current.activeSMask = null;
}
}, },
restore: function CanvasGraphics_restore() { restore: function CanvasGraphics_restore() {
var prev = this.stateStack.pop(); if (this.stateStack.length !== 0) {
if (prev) { if (this.current.activeSMask !== null) {
if (this.current.activeSMask) {
this.endSMaskGroup(); this.endSMaskGroup();
} }
this.current = prev; this.current = this.stateStack.pop();
this.ctx.restore(); this.ctx.restore();
} }
}, },
@ -1507,7 +1504,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
// Color // Color
getColorN_Pattern: function CanvasGraphics_getColorN_Pattern(IR) { getColorN_Pattern: function CanvasGraphics_getColorN_Pattern(IR) {
var pattern; var pattern;
if (IR[0] == 'TilingPattern') { if (IR[0] === 'TilingPattern') {
var color = IR[1]; var color = IR[1];
pattern = new TilingPattern(IR, color, this.ctx, this.objs, pattern = new TilingPattern(IR, color, this.ctx, this.objs,
this.commonObjs, this.baseTransform); this.commonObjs, this.baseTransform);
@ -1583,13 +1580,13 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
this.save(); this.save();
this.baseTransformStack.push(this.baseTransform); this.baseTransformStack.push(this.baseTransform);
if (matrix && isArray(matrix) && 6 == matrix.length) { if (isArray(matrix) && 6 === matrix.length) {
this.transform.apply(this, matrix); this.transform.apply(this, matrix);
} }
this.baseTransform = this.ctx.mozCurrentTransform; this.baseTransform = this.ctx.mozCurrentTransform;
if (bbox && isArray(bbox) && 4 == bbox.length) { if (isArray(bbox) && 4 === bbox.length) {
var width = bbox[2] - bbox[0]; var width = bbox[2] - bbox[0];
var height = bbox[3] - bbox[1]; var height = bbox[3] - bbox[1];
this.rectangle(bbox[0], bbox[1], width, height); this.rectangle(bbox[0], bbox[1], width, height);
@ -1741,7 +1738,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
matrix) { matrix) {
this.save(); this.save();
if (rect && isArray(rect) && 4 == rect.length) { if (isArray(rect) && 4 === rect.length) {
var width = rect[2] - rect[0]; var width = rect[2] - rect[0];
var height = rect[3] - rect[1]; var height = rect[3] - rect[1];
this.rectangle(rect[0], rect[1], width, height); this.rectangle(rect[0], rect[1], width, height);
@ -2059,7 +2056,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
consumePath: function CanvasGraphics_consumePath() { consumePath: function CanvasGraphics_consumePath() {
var ctx = this.ctx; var ctx = this.ctx;
if (this.pendingClip) { if (this.pendingClip) {
if (this.pendingClip == EO_CLIP) { if (this.pendingClip === EO_CLIP) {
if (ctx.mozFillRule !== undefined) { if (ctx.mozFillRule !== undefined) {
ctx.mozFillRule = 'evenodd'; ctx.mozFillRule = 'evenodd';
ctx.clip(); ctx.clip();