diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-10-17 10:44:00 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-17 10:44:00 -0400 |
commit | 58c61d3aed273f29d0b19d80b194dc384ce147f0 (patch) | |
tree | d647f56aa041267fbf52c40bca02b11d89e49b1a /components/script/dom/bindings | |
parent | d8f2f2ef0e7354afecd0f3fc398629013480bafb (diff) | |
parent | b8f3e8bb2e9bed269a06134c902a139cfa42eb1c (diff) | |
download | servo-58c61d3aed273f29d0b19d80b194dc384ce147f0.tar.gz servo-58c61d3aed273f29d0b19d80b194dc384ce147f0.zip |
Auto merge of #24315 - notriddle:GH-4577, r=nox
Add simple implementation of content-security-policy on network requests
This needs a lot more hooks before it'll actually be a good implementation, but for a start it can help get some feedback on if this is the right way to go about it.
Part of servo/servo#4577 but we should probably track the rest of the implementation somewhere.
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] There are tests for these changes (before merging, this PR should fix at least some of the WPT tests for CSP)
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/24315)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/bindings')
-rw-r--r-- | components/script/dom/bindings/trace.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs index e86c96e0a9e..a914b8161a6 100644 --- a/components/script/dom/bindings/trace.rs +++ b/components/script/dom/bindings/trace.rs @@ -54,6 +54,7 @@ use canvas_traits::webgl::{ use canvas_traits::webgl::{WebGLFramebufferId, WebGLMsgSender, WebGLPipeline, WebGLProgramId}; use canvas_traits::webgl::{WebGLReceiver, WebGLRenderbufferId, WebGLSLVersion, WebGLSender}; use canvas_traits::webgl::{WebGLShaderId, WebGLSyncId, WebGLTextureId, WebGLVersion}; +use content_security_policy::CspList; use crossbeam_channel::{Receiver, Sender}; use cssparser::RGBA; use devtools_traits::{CSSError, TimelineMarkerType, WorkerId}; @@ -170,6 +171,8 @@ unsafe_no_jsmanaged_fields!(*mut JobQueue); unsafe_no_jsmanaged_fields!(Cow<'static, str>); +unsafe_no_jsmanaged_fields!(CspList); + /// Trace a `JSVal`. pub fn trace_jsval(tracer: *mut JSTracer, description: &str, val: &Heap<JSVal>) { unsafe { |