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

auto merge of #4202 : zwarich/servo/remove-libgreen, r=larsbergstrom

Browse source
This commit is contained in:
bors-servo 2014-12-03 18:27:57 -07:00
commit 92cc423709
5 changed files with 3 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

16
components/servo/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();
}
}