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

Fix merge problem with argsArray/fnArray.

Browse Source
This commit is contained in:
= 2011-10-20 10:01:25 -07:00
parent 452f33b328
commit d4a810e2b3
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pdf.js
View File

@ -3514,11 +3514,19 @@ var Page = (function pagePage() {
var self = this; var self = this;
this.IRQueue = IRQueue; this.IRQueue = IRQueue;
var gfx = new CanvasGraphics(this.ctx, this.objs); var gfx = new CanvasGraphics(this.ctx, this.objs);
var continuation = this.callback; var startTime = Date.now();
var continuation = function(err) {
var pageNum = this.pageNumber + 1;
console.log('page=%d - rendering time: time=%dms',
pageNum, Date.now() - startTime);
console.log('page=%d - total time: time=%dms',
pageNum, Date.now() - this.startRenderingTime);
this.callback(err);
}.bind(this);
var displayContinuation = function pageDisplayContinuation() { var displayContinuation = function pageDisplayContinuation() {
console.log('--display--'); console.log('--display--');
// Always defer call to display() to work around bug in // Always defer call to display() to work around bug in
// Firefox error reporting from XHR callbacks. // Firefox error reporting from XHR callbacks.
setTimeout(function pageSetTimeout() { setTimeout(function pageSetTimeout() {
@ -3606,6 +3614,7 @@ var Page = (function pagePage() {
self.stats.render = Date.now(); self.stats.render = Date.now();
console.log('page=%d - executeIRQueue: time=%dms', console.log('page=%d - executeIRQueue: time=%dms',
self.pageNumber + 1, self.stats.render - startTime); self.pageNumber + 1, self.stats.render - startTime);
console.log('call back');
callback(); callback();
} }
} }
@ -3668,7 +3677,7 @@ var Page = (function pagePage() {
} }
return links; return links;
}, },
startRendering: function(ctx, callback, errback) { startRendering: function(ctx, callback) {
this.ctx = ctx; this.ctx = ctx;
this.callback = callback; this.callback = callback;
@ -4683,7 +4692,7 @@ var PartialEvaluator = (function partialEvaluator() {
var patterns = xref.fetchIfRef(resources.get('Pattern')) || new Dict(); var patterns = xref.fetchIfRef(resources.get('Pattern')) || new Dict();
var parser = new Parser(new Lexer(stream), false); var parser = new Parser(new Lexer(stream), false);
var res = resources; var res = resources;
var args = [], argsArray = [], fnArray = [], obj; var args = [], obj;
var getObjBt = function getObjBt() { var getObjBt = function getObjBt() {
parser = this.oldParser; parser = this.oldParser;
return { name: 'BT' }; return { name: 'BT' };
@ -6082,7 +6091,6 @@ var CanvasGraphics = (function canvasGraphics() {
paintImageXObject: function(imgData) { paintImageXObject: function(imgData) {
this.save(); this.save();
var ctx = this.ctx; var ctx = this.ctx;
var w = imgData.width; var w = imgData.width;
var h = imgData.height; var h = imgData.height;