servo: Merge #11325 - Move sandboxing into the constellation crate (from servo:sandboxing); r=nox

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 --faster` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

Either:
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because refactoring

Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process.

Source-Repo: https://github.com/servo/servo
Source-Revision: 6b039612bac3159a51d09e341c18f9a6ccc948b1

--HG--
rename : servo/components/compositing/sandboxing.rs => servo/components/constellation/sandboxing.rs

servo/components/compositing/Cargo.toml

@@ -33,6 +33,3 @@ serde = "0.7"
 serde_macros = "0.7"
 time = "0.1.17"
 url = {version = "1.0.0", features = ["heap_size"]}
-
-[target.'cfg(not(target_os = "windows"))'.dependencies]
-gaol = {git = "https://github.com/servo/gaol"}

servo/components/compositing/lib.rs

@@ -15,8 +15,6 @@ extern crate app_units;
 
 extern crate azure;
 extern crate euclid;
-#[cfg(not(target_os = "windows"))]
-extern crate gaol;
 extern crate gfx;
 extern crate gfx_traits;
 extern crate gleam;
@@ -59,8 +57,6 @@ mod compositor;
 mod compositor_layer;
 pub mod compositor_thread;
 mod delayed_composition;
-#[cfg(not(target_os = "windows"))]
-pub mod sandboxing;
 mod surface_map;
 mod touch;
 pub mod windowing;

servo/components/constellation/constellation.rs

@@ -16,8 +16,6 @@ use clipboard::ClipboardContext;
 use compositing::CompositorMsg as FromCompositorMsg;
 use compositing::compositor_thread::CompositorProxy;
 use compositing::compositor_thread::Msg as ToCompositorMsg;
-#[cfg(not(target_os = "windows"))]
-use compositing::sandboxing;
 use compositing::{AnimationTickType, SendableFrameTree};
 use devtools_traits::{ChromeToDevtoolsControlMsg, DevtoolsControlMsg};
 use euclid::scale_factor::ScaleFactor;
@@ -49,6 +47,8 @@ use pipeline::{InitialPipelineState, Pipeline, UnprivilegedPipelineContent};
 use profile_traits::mem;
 use profile_traits::time;
 use rand::{random, Rng, SeedableRng, StdRng};
+#[cfg(not(target_os = "windows"))]
+use sandboxing::content_process_sandbox_profile;
 use script_traits::{AnimationState, CompositorEvent, ConstellationControlMsg};
 use script_traits::{DocumentState, LayoutControlMsg};
 use script_traits::{IFrameLoadInfo, IFrameSandboxState, TimerEventRequest};
@@ -482,7 +482,7 @@ impl<LTF: LayoutThreadFactory, STF: ScriptThreadFactory> Constellation<LTF, STF>
                 command.env("RUST_BACKTRACE", value);
             }
 
-            let profile = sandboxing::content_process_sandbox_profile();
+            let profile = content_process_sandbox_profile();
             ChildProcess::Sandboxed(Sandbox::new(profile).start(&mut command)
                                     .expect("Failed to start sandboxed child process!"))
         } else {

servo/components/constellation/lib.rs

@@ -43,7 +43,11 @@ extern crate webrender_traits;
 
 mod constellation;
 mod pipeline;
+#[cfg(not(target_os = "windows"))]
+mod sandboxing;
 mod timer_scheduler;
 
 pub use constellation::{Constellation, InitialConstellationState};
 pub use pipeline::UnprivilegedPipelineContent;
+#[cfg(not(target_os = "windows"))]
+pub use sandboxing::content_process_sandbox_profile;

servo/components/servo/Cargo.lock

@@ -309,7 +309,6 @@ dependencies = [
  "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "azure 0.4.5 (git+https://github.com/servo/rust-azure)",
  "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "gaol 0.0.1 (git+https://github.com/servo/gaol)",
  "gfx 0.0.1",
  "gfx_traits 0.0.1",
  "gleam 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",

servo/components/servo/lib.rs

@@ -60,11 +60,11 @@ fn webdriver(_port: u16, _constellation: Sender<ConstellationMsg>) { }
 use compositing::CompositorEventListener;
 use compositing::CompositorMsg as ConstellationMsg;
 use compositing::compositor_thread::InitialCompositorState;
-#[cfg(not(target_os = "windows"))]
-use compositing::sandboxing;
 use compositing::windowing::WindowEvent;
 use compositing::windowing::WindowMethods;
 use compositing::{CompositorProxy, CompositorThread};
+#[cfg(not(target_os = "windows"))]
+use constellation::content_process_sandbox_profile;
 use constellation::{Constellation, InitialConstellationState, UnprivilegedPipelineContent};
 #[cfg(not(target_os = "windows"))]
 use gaol::sandbox::{ChildSandbox, ChildSandboxMethods};
@@ -280,7 +280,7 @@ pub unsafe extern fn __errno_location() -> *mut i32 {
 
 #[cfg(not(target_os = "windows"))]
 fn create_sandbox() {
-    ChildSandbox::new(sandboxing::content_process_sandbox_profile()).activate()
+    ChildSandbox::new(content_process_sandbox_profile()).activate()
         .expect("Failed to activate sandbox!");
 }
 

servo/ports/cef/Cargo.lock

@@ -271,7 +271,6 @@ dependencies = [
  "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "azure 0.4.5 (git+https://github.com/servo/rust-azure)",
  "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "gaol 0.0.1 (git+https://github.com/servo/gaol)",
  "gfx 0.0.1",
  "gfx_traits 0.0.1",
  "gleam 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",

servo/ports/gonk/Cargo.lock

@@ -273,7 +273,6 @@ dependencies = [
  "app_units 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "azure 0.4.5 (git+https://github.com/servo/rust-azure)",
  "euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "gaol 0.0.1 (git+https://github.com/servo/gaol)",
  "gfx 0.0.1",
  "gfx_traits 0.0.1",
  "gleam 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",