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

Remove use of rustuv/green in the gonk port.

Browse source
This commit is contained in:
Michael Wu 2014-12-09 16:08:42 -05:00
parent cbbbf4fbb5
commit 4d71be1fc9
2 changed files with 1 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

23
ports/gonk/Cargo.lock generated
View file

@ -256,11 +256,6 @@ dependencies = [
"gl_generator 0.0.1 (git+https://github.com/bjz/gl-rs.git)",
]
[[package]]
name = "green"
version = "0.0.1"
source = "git+https://github.com/servo/green-rs?ref=servo#9300d7e7dc73680c7446d78b10a309095636e64d"
[[package]]
name = "harfbuzz"
version = "0.1.0"
@ -311,11 +306,9 @@ dependencies = [
[[package]]
name = "js"
version = "0.1.0"
source = "git+https://github.com/servo/rust-mozjs#2a7acd8c04949796c71145db61b7868128e497f2"
source = "git+https://github.com/servo/rust-mozjs#7563bbd5abf12a1f0d01661c525b1f2491f783a9"
dependencies = [
"green 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)",
"mozjs-sys 0.0.0 (git+https://github.com/servo/mozjs)",
"rustuv 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)",
]
[[package]]
@ -487,15 +480,6 @@ name = "rust-xml"
version = "0.1.0"
source = "git+https://github.com/netvl/rust-xml#d6c57380a300b94f7e7881979dbe5459dbe4ca06"
[[package]]
name = "rustuv"
version = "0.0.1"
source = "git+https://github.com/servo/green-rs?ref=servo#9300d7e7dc73680c7446d78b10a309095636e64d"
dependencies = [
"green 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)",
"tls 0.0.1 (git+https://github.com/alexcrichton/tls-rs)",
]
[[package]]
name = "script"
version = "0.0.1"
@ -600,11 +584,6 @@ dependencies = [
name = "task_info"
version = "0.0.1"
[[package]]
name = "tls"
version = "0.0.1"
source = "git+https://github.com/alexcrichton/tls-rs#e5e240c35e2c3401ea750ee61221d917398c5ef1"
[[package]]
name = "typeable"
version = "0.0.3"

16
ports/gonk/src/lib.rs
View file

@ -15,14 +15,12 @@ extern crate log;
extern crate compositing;
extern crate devtools;
extern crate rustuv;
extern crate "net" as servo_net;
extern crate "msg" as servo_msg;
#[phase(plugin, link)]
extern crate "util" as servo_util;
extern crate script;
extern crate layout;
extern crate green;
extern crate gfx;
extern crate libc;
extern crate native;
@ -56,8 +54,6 @@ use servo_util::opts;
#[cfg(not(test))]
use servo_util::taskpool::TaskPool;
#[cfg(not(test))]
use green::GreenTaskBuilder;
#[cfg(not(test))]
use std::os;
#[cfg(not(test))]
@ -66,25 +62,16 @@ use std::rc::Rc;
use std::task::TaskBuilder;
pub struct Browser<Window> {
pool: green::SchedPool,
compositor: Box<CompositorEventListener + 'static>,
}
impl<Window> Browser<Window> where Window: WindowMethods + 'static {
#[cfg(not(test))]
pub fn new(window: Option<Rc<Window>>) -> Browser<Window> {
use rustuv::EventLoop;
fn event_loop() -> Box<green::EventLoop + Send> {
box EventLoop::new().unwrap() as Box<green::EventLoop + Send>
}
::servo_util::opts::set_experimental_enabled(opts::get().enable_experimental);
let opts = opts::get();
RegisterBindings::RegisterProxyHandlers();
let mut pool_config = green::PoolConfig::new();
pool_config.event_loop_factory = event_loop;
let mut pool = green::SchedPool::new(pool_config);
let shared_task_pool = TaskPool::new(8);
let (compositor_proxy, compositor_receiver) =
@ -101,7 +88,6 @@ impl<Window> Browser<Window> where Window: WindowMethods + 'static {
let (result_chan, result_port) = channel();
let compositor_proxy_for_constellation = compositor_proxy.clone_compositor_proxy();
TaskBuilder::new()
.green(&mut pool)
.spawn(proc() {
let opts = &opts_clone;
// Create a Servo instance.
@ -155,7 +141,6 @@ impl<Window> Browser<Window> where Window: WindowMethods + 'static {
memory_profiler_chan);
Browser {
pool: pool,
compositor: compositor,
}
}
@ -170,7 +155,6 @@ impl<Window> Browser<Window> where Window: WindowMethods + 'static {
pub fn shutdown(mut self) {
self.compositor.shutdown();
self.pool.shutdown();
}
}