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

[Bug 1237908] Make pdf.js use the correct principal origin attributes when loading … #7114

Merged
merged 1 commit into from
Apr 6, 2016

Conversation

dhuseby
Copy link

@dhuseby dhuseby commented Mar 25, 2016

…subresources.

// e.g. useful for NoScript
var ssm = Cc['@mozilla.org/scriptsecuritymanager;1']
.getService(Ci.nsIScriptSecurityManager);
var uri = NetUtil.newURI(PDF_VIEWER_WEB_PAGE, null, null);
var resourcePrincipal;
//#if MOZCENTRAL
resourcePrincipal = ssm.createCodebasePrincipal(uri, {});
resourcePrincipal = ssm.createCodebasePrincipal(uri, aRequest.loadInfo.originAttributes);
Copy link
Contributor

Choose a reason for hiding this comment

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

Lint complains about this line being too long.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Should this change also be made at line 1104 just below?

@dhuseby
Copy link
Author

dhuseby commented Mar 28, 2016

You're right, let me fix these two things. Thanks for the feedback.

@timvandermeij
Copy link
Contributor

After fixing this, please make sure that the commits are squashed (https://github.com/mozilla/pdf.js/wiki/Squashing-Commits).

@dhuseby
Copy link
Author

dhuseby commented Apr 4, 2016

@timvandermeij I fixed the patch and squashed everything to a single commit. Thanks for the review feedback.

@yurydelendik yurydelendik changed the title Make pdf.js use the correct principal origin attributes when loading … [Bug 1237908] Make pdf.js use the correct principal origin attributes when loading … Apr 6, 2016
@yurydelendik
Copy link
Contributor

Thank you for the patch.

@yurydelendik yurydelendik merged commit f9a0dc1 into mozilla:master Apr 6, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants