Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Apr 23, 2013

Conversation

mduan
Copy link
Contributor

@mduan mduan commented Apr 22, 2013

Fixes #3133.

The problem is that because of #2719, PartialEvaluator.getOperatorList() and PartialEvaluator.getTextContent() can run interleaved. As a result we could be assigning the same dependency name to different images/fonts.

@mduan
Copy link
Contributor Author

mduan commented Apr 22, 2013

/botio-windows preview

@pdfjsbot
Copy link

From: Bot.io (Windows)


Received

Command cmd_preview from @mduan received. Current queue size: 0

Live output at: http://107.22.172.223:8877/7047e01f59eb038/output.txt

@pdfjsbot
Copy link

@mduan
Copy link
Contributor Author

mduan commented Apr 22, 2013

/botio test

@pdfjsbot
Copy link

From: Bot.io (Windows)


Received

Command cmd_test from @mduan received. Current queue size: 0

Live output at: http://107.22.172.223:8877/90102a87f45923f/output.txt

@pdfjsbot
Copy link

From: Bot.io (Linux)


Received

Command cmd_test from @mduan received. Current queue size: 0

Live output at: http://107.21.233.14:8877/edd437ccc12fe64/output.txt

@pdfjsbot
Copy link

From: Bot.io (Linux)


Success

Full output at http://107.21.233.14:8877/edd437ccc12fe64/output.txt

Total script time: 21.89 mins

  • Font tests: Passed
  • Unit tests: Passed
  • Regression tests: Passed

@pdfjsbot
Copy link

From: Bot.io (Windows)


Success

Full output at http://107.22.172.223:8877/90102a87f45923f/output.txt

Total script time: 25.37 mins

  • Font tests: Passed
  • Unit tests: Passed
  • Regression tests: Passed

@@ -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,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: It looks like all these will be declared variables. Tab them in one more or bring pdfManager up a line and then align all params with that.

@mduan
Copy link
Contributor Author

mduan commented Apr 22, 2013

Addressed @brendandahl's comments.

@brendandahl
Copy link
Contributor

/botio test

@pdfjsbot
Copy link

From: Bot.io (Linux)


Received

Command cmd_test from @brendandahl received. Current queue size: 0

Live output at: http://107.21.233.14:8877/52240d029e9e810/output.txt

@pdfjsbot
Copy link

From: Bot.io (Windows)


Received

Command cmd_test from @brendandahl received. Current queue size: 0

Live output at: http://107.22.172.223:8877/e70c494061356f3/output.txt

@pdfjsbot
Copy link

From: Bot.io (Linux)


Success

Full output at http://107.21.233.14:8877/52240d029e9e810/output.txt

Total script time: 21.79 mins

  • Font tests: Passed
  • Unit tests: Passed
  • Regression tests: Passed

@pdfjsbot
Copy link

From: Bot.io (Windows)


Success

Full output at http://107.22.172.223:8877/e70c494061356f3/output.txt

Total script time: 25.09 mins

  • Font tests: Passed
  • Unit tests: Passed
  • Regression tests: Passed

brendandahl added a commit that referenced this pull request Apr 23, 2013
Use same obj/font id counter for all partial evaluators on page
@brendandahl brendandahl merged commit 75e3ea0 into mozilla:master Apr 23, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Regression from #2719 (3)
3 participants