Auto merge of #23468 - servo:jdm-patch-52, r=asajeffrey

Add Windows arm64 build.

Depends on:
* [x] https://github.com/servo/mozjs/pull/184
* [x] https://github.com/servo/rust-mozjs/pull/463
* [ ] <strike>https://github.com/servo/ipc-channel/pull/232</strike>
* [x] https://github.com/alexcrichton/cmake-rs/pull/82
* [x] https://github.com/servo/rust-offscreen-rendering-context/pull/136
* [x] https://github.com/servo/mozangle/pull/21

<!-- 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/23468)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2019-06-11 17:21:36 -04:00 committed by GitHub
commit 8e783577d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 338 additions and 246 deletions

View file

@ -51,7 +51,10 @@ impl BackgroundHangMonitorRegister for HangMonitorRegister {
) -> Box<BackgroundHangMonitor> {
let bhm_chan = BackgroundHangMonitorChan::new(self.sender.clone(), component_id);
#[cfg(target_os = "windows")]
#[cfg(all(
target_os = "windows",
any(target_arch = "x86_64", target_arch = "x86")
))]
let sampler = crate::sampler_windows::WindowsSampler::new();
#[cfg(target_os = "macos")]
let sampler = crate::sampler_mac::MacOsSampler::new();

View file

@ -15,6 +15,7 @@ azure_backend = ["azure"]
default = ["azure_backend"]
webgl_backtrace = ["canvas_traits/webgl_backtrace"]
raqote_backend = ["raqote"]
no_wgl = ["offscreen_gl_context/no_wgl"]
[dependencies]
azure = {git = "https://github.com/servo/rust-azure", optional = true}

View file

@ -13,6 +13,7 @@ path = "lib.rs"
[features]
azure_backend = ["canvas/azure_backend"]
raqote_backend = ["canvas/raqote_backend"]
no_wgl = ["canvas/no_wgl"]
[dependencies]
background_hang_monitor = { path = "../background_hang_monitor"}

View file

@ -599,7 +599,11 @@ impl UnprivilegedPipelineContent {
}
}
#[cfg(any(target_os = "android", target_arch = "arm", target_arch = "aarch64"))]
#[cfg(any(
target_os = "android",
target_arch = "arm",
all(target_arch = "aarch64", not(target_os = "windows"))
))]
pub fn spawn_multiprocess(self) -> Result<(), Error> {
use ipc_channel::ipc::IpcOneShotServer;
// Note that this function can panic, due to process creation,

View file

@ -65,7 +65,7 @@ indexmap = "1.0.2"
ipc-channel = "0.11"
itertools = "0.8"
jstraceable_derive = {path = "../jstraceable_derive"}
js = {package = "mozjs", git = "https://github.com/servo/rust-mozjs", rev = "357d1db91e4e49c3f148fe05fdfae5f8f0834ca8"}
js = {package = "mozjs", git = "https://github.com/servo/rust-mozjs"}
keyboard-types = "0.4.4"
lazy_static = "1"
libc = "0.2"

View file

@ -20,6 +20,7 @@ googlevr = ["webvr/googlevr"]
js_backtrace = ["script/js_backtrace"]
max_log_level = ["log/release_max_level_info"]
native-bluetooth = ["bluetooth/native-bluetooth"]
no_wgl = ["canvas/no_wgl"]
raqote_backend = ["canvas/raqote_backend"]
webrender_debugger = ["webrender/debugger"]
no_static_freetype = ["webrender/no_static_freetype"]