Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Replace rust-websocket with ws-rs in the debugger server.

Browse source
This commit is contained in:
Eddy Bruel 2016-09-12 12:32:19 +02:00 • committed by Anthony Ramine
parent 1c26f44cbb
commit c8c5254f8b
9 changed files with 239 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/servo/lib.rs
View file

@ -128,9 +128,9 @@ impl<Window> Browser<Window> where Window: WindowMethods + 'static {
let time_profiler_chan = profile_time::Profiler::create(&opts.time_profiling,
opts.time_profiler_trace_path.clone());
let mem_profiler_chan = profile_mem::Profiler::create(opts.mem_profiler_period);
if let Some(port) = opts.debugger_port {
let debugger_chan = opts.debugger_port.map(|port| {
debugger::start_server(port)
}
});
let devtools_chan = opts.devtools_port.map(|port| {
devtools::start_server(port)
});
@ -176,6 +176,7 @@ impl<Window> Browser<Window> where Window: WindowMethods + 'static {
compositor_proxy.clone_compositor_proxy(),
time_profiler_chan.clone(),
mem_profiler_chan.clone(),
debugger_chan,
devtools_chan,
supports_clipboard,
webrender_api_sender.clone());
@ -240,6 +241,7 @@ fn create_constellation(opts: opts::Opts,
compositor_proxy: Box<CompositorProxy + Send>,
time_profiler_chan: time::ProfilerChan,
mem_profiler_chan: mem::ProfilerChan,
debugger_chan: Option<debugger::Sender>,
devtools_chan: Option<Sender<devtools_traits::DevtoolsControlMsg>>,
supports_clipboard: bool,
webrender_api_sender: webrender_traits::RenderApiSender)
@ -260,6 +262,7 @@ fn create_constellation(opts: opts::Opts,
let initial_state = InitialConstellationState {
compositor_proxy: compositor_proxy,
debugger_chan: debugger_chan,
devtools_chan: devtools_chan,
bluetooth_thread: bluetooth_thread,
image_cache_thread: image_cache_thread,