mirrors/pdf.js
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2025-04-26 10:08:06 +02:00
Code Activity

Use same obj/font id counter for all partial evaluators on page

Browse source
This commit is contained in:
Mack Duan 2013-04-22 14:20:49 -07:00
parent 8ae5d2745c
commit d69f14328c
2 changed files with 25 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/core.js
View file

@ -66,6 +66,10 @@ var Page = (function PageClosure() {
this.pageDict = pageDict;
this.xref = xref;
this.ref = ref;
this.idCounters = {
font: 0,
obj: 0
};
}
Page.prototype = {
@ -159,17 +163,19 @@ var Page = (function PageClosure() {
var contentStreamPromise = pdfManager.ensure(this, 'getContentStream',
[]);
var resourcesPromise = pdfManager.ensure(this, 'resources');
var partialEvaluator = new PartialEvaluator(
pdfManager, this.xref, handler,
this.pageIndex, 'p' + this.pageIndex + '_',
this.idCounters);
var dataPromises = Promise.all(
[contentStreamPromise, resourcesPromise]);
dataPromises.then(function(data) {
var contentStream = data[0];
var resources = data[1];
var pe = self.pe = new PartialEvaluator(
pdfManager,
self.xref, handler, self.pageIndex,
'p' + self.pageIndex + '_');
pdfManager.ensure(pe, 'getOperatorList',
pdfManager.ensure(partialEvaluator, 'getOperatorList',
[contentStream, resources]).then(
function(opListPromise) {
opListPromise.then(function(data) {
@ -181,11 +187,7 @@ var Page = (function PageClosure() {
pdfManager.ensure(this, 'getAnnotationsForDraw', []).then(
function(annotations) {
var annotationEvaluator = new PartialEvaluator(
pdfManager, self.xref, handler, self.pageIndex,
'p' + self.pageIndex + '_annotation');
pdfManager.ensure(annotationEvaluator, 'getAnnotationsOperatorList',
pdfManager.ensure(partialEvaluator, 'getAnnotationsOperatorList',
[annotations]).then(
function(opListPromise) {
opListPromise.then(function(data) {
@ -242,12 +244,13 @@ var Page = (function PageClosure() {
dataPromises.then(function(data) {
var contentStream = data[0];
var resources = data[1];
var pe = new PartialEvaluator(
pdfManager,
self.xref, handler, self.pageIndex,
'p' + self.pageIndex + '_');
var partialEvaluator = new PartialEvaluator(
pdfManager, self.xref, handler,
self.pageIndex, 'p' + self.pageIndex + '_',
self.idCounters);
pe.getTextContent(contentStream, resources).then(function(bidiTexts) {
partialEvaluator.getTextContent(
contentStream, resources).then(function(bidiTexts) {
textContentPromise.resolve({
bidiTexts: bidiTexts
});